diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/U b/tutorials/incompressible/pimpleFoam/t-junction/0/U
index 937d3966b255a95cf121b0233e6c1ad9cfe79759..8b3863aff9ee75866d55618473a8c18a4366f645 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/U
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/U
@@ -20,27 +20,36 @@ internalField uniform (0 0 0);
boundaryField
{
- inlet
+ inlet
{
type pressureInletOutletVelocity;
value uniform (0 0 0);
}
- outlet1
+ outlet1
{
type inletOutlet;
inletValue uniform (0 0 0);
value uniform (0 0 0);
}
- outlet2
+ outlet2
{
type inletOutlet;
inletValue uniform (0 0 0);
value uniform (0 0 0);
}
-
- defaultFaces
+ baffles
+ {
+ type fixedValue;
+ value uniform ( 0 0 0 );
+ }
+ fan
+ {
+ type cyclic;
+ value uniform ( 0 0 0 );
+ }
+ defaultFaces
{
type fixedValue;
value uniform (0 0 0);
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/epsilon b/tutorials/incompressible/pimpleFoam/t-junction/0/epsilon
index 98515b441d1ad8af8d69153722bfb7e6143af640..35ddfed6617fe6722388c66a195947607a3568bb 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/epsilon
@@ -27,23 +27,33 @@ boundaryField
mixingLength 0.01; // 1cm - half channel height
value uniform 1;
}
-
outlet1
{
type inletOutlet;
inletValue uniform 1;
+ value uniform 1;
}
outlet2
{
type inletOutlet;
inletValue uniform 1;
+ value uniform 1;
+ }
+ baffles
+ {
+ type epsilonWallFunction;
+ value uniform 1;
+ }
+ fan
+ {
+ type cyclic;
+ value uniform 1;
}
-
defaultFaces
{
type epsilonWallFunction;
- value uniform 0;
+ value uniform 1;
}
}
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/k b/tutorials/incompressible/pimpleFoam/t-junction/0/k
index 35f4e42f328d91108c3f44466c080b45dfaa1c0e..e87a5855d2cf51fe91b10aaf4de295e5377ad5c0 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/k
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/k
@@ -27,23 +27,34 @@ boundaryField
intensity 0.05; // 5% turbulent intensity
value uniform 1;
}
-
outlet1
{
type inletOutlet;
inletValue uniform 1;
+ value uniform 1;
}
outlet2
{
type inletOutlet;
inletValue uniform 1;
+ value uniform 1;
+ }
+ baffles
+ {
+ type kqRWallFunction;
+ value uniform 1;
+ }
+ fan
+ {
+ type cyclic;
+ value uniform 1;
}
defaultFaces
{
type kqRWallFunction;
- value uniform 0;
+ value uniform 1;
}
}
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda b/tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda
index fe8744b3989e69e694abd968d917fcb1fb9afc32..ff51eab08cf73307d699f0f4d70261a9094c11ce 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda
@@ -34,7 +34,15 @@ boundaryField
{
type zeroGradient;
}
-
+ baffles
+ {
+ type zeroGradient;
+ }
+ fan
+ {
+ type cyclic;
+ value uniform 0;
+ }
defaultFaces
{
type zeroGradient;
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/nut b/tutorials/incompressible/pimpleFoam/t-junction/0/nut
index b4a42336aae3ebcf05326e632164ac94f74da617..570f1f90ac5188e944d686866217964790e2118d 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/nut
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/nut
@@ -38,7 +38,16 @@ boundaryField
type calculated;
value uniform 0;
}
-
+ baffles
+ {
+ type nutkWallFunction;
+ value uniform 0;
+ }
+ fan
+ {
+ type cyclic;
+ value uniform 0;
+ }
defaultFaces
{
type nutkWallFunction;
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/p b/tutorials/incompressible/pimpleFoam/t-junction/0/p
index 93170d7a0cba0489f226d72d14e996c0755156c4..d9873e5b7a0f87d7979976f2b630a6cdcf3e26c1 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/p
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/p
@@ -20,7 +20,7 @@ internalField uniform 100000;
boundaryField
{
- inlet
+ inlet
{
//type totalPressure;
//p0 uniform 100040;
@@ -38,18 +38,28 @@ boundaryField
value uniform 100040;
}
- outlet1
+ outlet1
{
type fixedValue;
value uniform 100010;
}
- outlet2
+ outlet2
{
type fixedValue;
value uniform 100000;
}
-
+ baffles
+ {
+ type zeroGradient;
+ }
+ fan
+ {
+ type fan;
+ patchType cyclic;
+ f 2 ( 50 -0.1 );
+ value uniform 100000;
+ }
defaultFaces
{
type zeroGradient;
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/Allrun b/tutorials/incompressible/pimpleFoam/t-junction/Allrun
new file mode 100755
index 0000000000000000000000000000000000000000..54e4a04eddd818478efed08a70fde5c832f18897
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction/Allrun
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Get application name
+application=`getApplication`
+
+runApplication blockMesh
+
+
+# Creating patches 'out of nothing' so willl get undefined value which
+# might cause floating point error
+unset FOAM_SIGFPE
+unset FOAM_SETNAN
+
+# Add cyclic baffles for fan
+runApplication setSet -batch selectCyclics.setSet
+runApplication createBaffles cyclicFaces fan -overwrite
+
+# Add wall baffles
+rm log.setSet
+runApplication setSet -batch selectBaffles.setSet
+rm log.createBaffles
+runApplication createBaffles baffleFaces baffles -overwrite
+
+runApplication $application
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/README.txt b/tutorials/incompressible/pimpleFoam/t-junction/README.txt
index 0905f8784d3f59c9372dcbf858c093d8c4477ee7..fd3f970be58f695ca0eb8f2b82e7c39ced0700b6 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/README.txt
+++ b/tutorials/incompressible/pimpleFoam/t-junction/README.txt
@@ -1,2 +1,3 @@
-15/8/8 Simple T-junction. Inlet on left, one outlet at bottom, one at top.
+300-04-16 T-junction with baffles and fan.
+Inlet on left, one outlet at bottom, one at top.
To test multiple outlets.
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
index e0f535802189d68998a4ae5c687829d6ba1cfdb8..5e97f00deb0f66dd3126366c89d2659512dde203 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
@@ -100,6 +100,16 @@ patches
(
(8 18 19 9)
)
+
+ wall baffles
+ ()
+
+ cyclic fan
+ ()
+
+ wall defaultFaces
+ ()
+
);
mergePatchPairs
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary
index 85c7a93237345ae312feb0cc927e261b89d25c95..24c53efd55cf0afb003ec8b7b92bf27279f40aed 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-4
+6
(
inlet
{
@@ -35,6 +35,19 @@ FoamFile
nFaces 25;
startFace 10100;
}
+ baffles
+ {
+ type wall;
+ nFaces 0;
+ startFace 10125;
+ }
+ fan
+ {
+ type cyclic;
+ nFaces 0;
+ startFace 10125;
+ featureCos 0.9;
+ }
defaultFaces
{
type wall;
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/selectBaffles.setSet b/tutorials/incompressible/pimpleFoam/t-junction/selectBaffles.setSet
new file mode 100644
index 0000000000000000000000000000000000000000..b3e31fc713cb8fcd530a807dbc139ee3384378b3
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction/selectBaffles.setSet
@@ -0,0 +1,4 @@
+faceSet baffleFaces new boxToFace (0.099 -10 -10)(0.101 10 10)
+# Remove the centre faces that become fan
+faceSet baffleFaces delete boxToFace (0.099 -0.006 0.004)(0.101 0.006 0.016)
+faceZoneSet baffleFaces new setToFaceZone baffleFaces
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/selectCyclics.setSet b/tutorials/incompressible/pimpleFoam/t-junction/selectCyclics.setSet
new file mode 100644
index 0000000000000000000000000000000000000000..4dc1033bd2d3f60c5cce52492807e38b0cb7a983
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction/selectCyclics.setSet
@@ -0,0 +1,3 @@
+faceSet cyclicFaces new boxToFace (0.099 -0.006 0.004)(0.101 0.006 0.016)
+cellSet cyclicFacesSlaveCells new boxToCell (-10 -10 -10)(0.1 10 10)
+faceZoneSet cyclicFaces new setsToFaceZone cyclicFaces cyclicFacesSlaveCells
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
index 14ca5f309125570e46c540ba05ea732e8a2da7f7..a966fe894ba5b973e3f4d5bf3bef74d376688ca5 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+libs ("libOpenFOAM.so" "libincompressibleTurbulenceModel.so" "libincompressibleRASModels.so");
+
application pimpleFoam;
startFrom startTime;
@@ -37,7 +39,7 @@ writeFormat ascii;
writePrecision 6;
-writeCompression off;
+writeCompression uncompressed;
timeFormat general;