Merge remote-tracking branch 'origin/bugfix/updatePreconfiguredBoundaryTuts'

tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/constant/polyMesh/boundary.preconfigured

@@ -41,6 +41,7 @@ FoamFile
         nFaces          10;
         startFace       277;
         shadowPatch     mixpRightIn;
+        zone            mixpLeftOutZone;
         orientation dirY_spanZ;
         assembly both;
         coordinateSystem
@@ -50,6 +51,12 @@ FoamFile
             axis (0 0 1);
             direction (1 0 0);
         }
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Y;
+            sweepAxis Z;
+        }
     }
     mixpRightIn
     {
@@ -57,6 +64,7 @@ FoamFile
         nFaces          3;
         startFace       287;
         shadowPatch     mixpLeftOut;
+        zone            mixpRightInZone;
         orientation dirY_spanZ;
         assembly both;
         coordinateSystem
@@ -66,7 +74,12 @@ FoamFile
             axis (0 0 1);
             direction (1 0 0);
         }
-    }
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Y;
+            sweepAxis Z;
+        }    }
     rightOut
     {
         type            patch;

tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/constant/polyMesh/boundary.preconfigured

@@ -41,6 +41,7 @@ FoamFile
         nFaces          10;
         startFace       410;
         shadowPatch     mixpRightIn;
+        zone mixpLeftOutZone;
         orientation dirY_spanZ;
         assembly both;
         coordinateSystem
@@ -50,6 +51,12 @@ FoamFile
             axis (0 0 1);
             direction (1 0 0);
         }
+        ribbonPatch
+        {
+          sweepAxis Z;
+          stackAxis Y;
+          discretisation bothPatches;
+        }
     }
     mixpRightIn
     {
@@ -57,6 +64,7 @@ FoamFile
         nFaces          10;
         startFace       420;
         shadowPatch     mixpLeftOut;
+        zone mixpRightInZone;
         orientation dirY_spanZ;
         assembly both;
         coordinateSystem
@@ -66,6 +74,12 @@ FoamFile
             axis (0 0 1);
             direction (1 0 0);
         }
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Y;
+            sweepAxis Z;
+        }
     }
     rightOut
     {

tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/constant/polyMesh/boundary.preconfigured

@@ -41,6 +41,7 @@ FoamFile
         nFaces          10;
         startFace       410;
         shadowPatch     mixpRightIn;
+        zone            mixpLeftOutZone;
         orientation dirZ_spanY;
         assembly both;
         coordinateSystem
@@ -50,6 +51,12 @@ FoamFile
             axis (0 0 1);
             direction (1 0 0);
         }
+        ribbonPatch
+        {
+            sweepAxis Y;
+            stackAxis Z;
+            discretisation bothPatches;
+        }
     }
     mixpRightIn
     {
@@ -57,6 +64,7 @@ FoamFile
         nFaces          10;
         startFace       420;
         shadowPatch     mixpLeftOut;
+        zone            mixpRightInZone;
         orientation dirZ_spanY;
         assembly both;
         coordinateSystem
@@ -66,6 +74,12 @@ FoamFile
             axis (0 0 1);
             direction (1 0 0);
         }
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Z;
+            sweepAxis Y;
+        }
     }
     rightOut
     {

tutorials/incompressible/simpleFoam/mixingPlaneAxial/0.orig/epsilon

@@ -15,19 +15,40 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 0.1;
 
 boundaryField
 {
-    downstreamMixingPlanePatch
+    outflow
     {
-        type mixingPlane;
+        type            zeroGradient;
+    }
+    inflow
+    {
+        type            fixedValue;
+        value           uniform 0.1;
+    }
+    upstreamPerio1
+    {
+        type            cyclicGgi;
+        value           uniform 0.1;
+    }
+    upstreamPerio2
+    {
+        type            cyclicGgi;
+        value           uniform 0.1;
     }
     upstreamMixingPlanePatch
     {
         type            mixingPlane;
+        value           uniform 0.1;
+    }
+    downstreamMixingPlanePatch
+    {
+        type            mixingPlane;
+        value           uniform 0.1;
     }
     downstreamWall
     {
@@ -40,29 +61,13 @@ boundaryField
     downstreamPerio1
     {
         type            cyclicGgi;
+        value           uniform 0.1;
     }
     downstreamPerio2
     {
         type            cyclicGgi;
-    }
-    upstreamPerio1
-    {
-        type cyclicGgi;
-    }
-    upstreamPerio2
-    {
-        type cyclicGgi;
-    }
-    inflow
-    {
-        type fixedValue;
         value           uniform 0.1;
     }
-    outflow
-    {
-        type zeroGradient;
-    }
 }
 
 // ************************************************************************* //
-

tutorials/incompressible/simpleFoam/mixingPlaneAxial/0.orig/k

@@ -15,27 +15,40 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
-internalField uniform 0.01;
+internalField   uniform 0.1;
 
 boundaryField
 {
-    downstreamPerio1
+    outflow
     {
-        type cyclicGgi;
+        type            zeroGradient;
     }
-    downstreamPerio2
+    inflow
     {
-        type cyclicGgi;
+        type            fixedValue;
+        value           uniform 0.01;
     }
     upstreamPerio1
     {
         type            cyclicGgi;
+        value           uniform 0.1;
     }
     upstreamPerio2
     {
         type            cyclicGgi;
+        value           uniform 0.1;
+    }
+    upstreamMixingPlanePatch
+    {
+        type            mixingPlane;
+        value           uniform 0.1;
+    }
+    downstreamMixingPlanePatch
+    {
+        type            mixingPlane;
+        value           uniform 0.1;
     }
     downstreamWall
     {
@@ -45,25 +58,16 @@ boundaryField
     {
         type            symmetryPlane;
     }
-    downstreamMixingPlanePatch
+    downstreamPerio1
     {
-        type mixingPlane;
+        type            cyclicGgi;
+        value           uniform 0.1;
     }
-    upstreamMixingPlanePatch
+    downstreamPerio2
     {
-        type mixingPlane;
+        type            cyclicGgi;
+        value           uniform 0.1;
     }
-    inflow
-    {
-        type fixedValue;
-        value uniform 0.01;
-    }
-    outflow
-    {
-        type zeroGradient;
-    }
-
 }
 
 // ************************************************************************* //
-

tutorials/incompressible/simpleFoam/mixingPlaneAxial/0.orig/nut

@@ -11,23 +11,45 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      epsilon;
+    object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
-internalField uniform 0.1;
+internalField   uniform 0;
 
 boundaryField
 {
-    downstreamMixingPlanePatch
+    outflow
     {
-        type mixingPlane;
+        type            calculated;
+        value           uniform 0;
+    }
+    inflow
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    upstreamPerio1
+    {
+        type            cyclicGgi;
+        value           uniform 0;
+    }
+    upstreamPerio2
+    {
+        type            cyclicGgi;
+        value           uniform 0;
     }
     upstreamMixingPlanePatch
     {
         type            mixingPlane;
+        value           uniform 0;
+    }
+    downstreamMixingPlanePatch
+    {
+        type            mixingPlane;
+        value           uniform 0;
     }
     downstreamWall
     {
@@ -40,29 +62,13 @@ boundaryField
     downstreamPerio1
     {
         type            cyclicGgi;
+        value           uniform 0;
     }
     downstreamPerio2
     {
         type            cyclicGgi;
-    }
+        value           uniform 0;
-    upstreamPerio1
-    {
-        type cyclicGgi;
-    }
-    upstreamPerio2
-    {
-        type cyclicGgi;
-    }
-    inflow
-    {
-        type fixedValue;
-        value uniform 0.1;
-    }
-    outflow
-    {
-        type zeroGradient;
     }
 }
 
 // ************************************************************************* //
-

tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/k.old

@@ -1,69 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.1                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      k;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [ 0 2 -2 0 0 0 0 ];
-
-internalField uniform 0.1;
-
-boundaryField
-{
-    downstreamPerio1
-    {
-        type cyclicGgi;
-    }
-    downstreamPerio2
-    {
-        type cyclicGgi;
-    }
-    upstreamPerio1
-    {
-        type cyclicGgi;
-    }
-    upstreamPerio2
-    {
-        type cyclicGgi;
-    }
-    downstreamWall
-    {
-        type symmetryPlane;
-    }
-    upstreamWall
-    {
-        type symmetryPlane;
-    }
-    downstreamMixingPlanePatch
-    {
-        type mixingPlane;
-    }
-    upstreamMixingPlanePatch
-    {
-        type mixingPlane;
-    }
-    inflow
-    {
-        type fixedValue;
-        value uniform 0.01;
-    }
-    outflow
-    {
-        type zeroGradient;
-    }
-
-}
-
-// ************************************************************************* //
-

tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/save/U

@@ -1,71 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.1                                |
-|   \\  /    A nd           | Web:         http://www.extend-project.de       |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volVectorField;
-    location    "0";
-    object      U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
-    upstreamMixingPlanePatch
-    {
-        type mixingPlane;
-    }
-    downstreamMixingPlanePatch
-    {
-        type mixingPlane;
-    }
-    upstreamPerio1
-    {
-        type cyclicGgi;
-    }
-    upstreamPerio2
-    {
-        type cyclicGgi;
-    }
-    downstreamPerio1
-    {
-        type cyclicGgi;
-    }
-    downstreamPerio2
-    {
-        type cyclicGgi;
-    }
-    downstreamWall
-    {
-        type symmetryPlane;
-    }
-    upstreamWall
-    {
-        type symmetryPlane;
-    }
-    inflow
-    {
-        type            surfaceNormalFixedValue;
-        refValue        uniform -10;
-        value           uniform (0 0 0);
-    }
-    outflow
-    {
-        type inletOutlet;
-        inletValue      uniform (0 0 0);
-        value           uniform (0 0 0);
-    }
-}
-
-// ************************************************************************* //
-

tutorials/incompressible/simpleFoam/mixingPlaneAxial/Allclean

@@ -5,3 +5,6 @@
 
 cleanCase
 \rm -rf *.py
+\rm -f constant/polyMesh/boundary
+\rm -rf 0
+\cp -r 0.orig 0

tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/blockMeshDict

@@ -18,17 +18,36 @@ FoamFile
 
 //m4 definitions -----------------------------
 
+
+
+
+
+
+
 //Geometry -----------------------------------
 // 2 planes levels
 
+
+
 // Angle span for inner block
 
+
+
 // Angle span for outer block
 
+
+
 // Radial dimensions
 
+
+
+
 // Mesh parameters
 
+
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 convertToMeters 1;

tutorials/incompressible/simpleFoam/mixingPlaneAxial/constant/polyMesh/boundary.preconfigured

@@ -0,0 +1,139 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | foam-extend: Open Source CFD                    |
+|  \\    /   O peration     | Version:     3.1                                |
+|   \\  /    A nd           | Web:         http://www.extend-project.de       |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+10
+(
+    outflow
+    {
+        type patch;
+        nFaces 27;
+        startFace 2106;
+    }
+    inflow
+    {
+        type patch;
+        nFaces 17;
+        startFace 2133;
+    }
+    upstreamPerio1
+    {
+        type cyclicGgi;
+        nFaces 25;
+        startFace 2150;
+        shadowPatch upstreamPerio2;
+        zone upstreamPerio1Zone;
+        bridgeOverlap no;
+        rotationAxis (0 0 1);
+        rotationAngle 36;
+        separationOffset (0 0 0);
+    }
+    upstreamPerio2
+    {
+        type cyclicGgi;
+        nFaces 25;
+        startFace 2175;
+        shadowPatch upstreamPerio1;
+        zone upstreamPerio2Zone;
+        bridgeOverlap no;
+        rotationAxis (0 0 1);
+        rotationAngle -36;
+        separationOffset (0 0 0);
+    }
+    upstreamMixingPlanePatch
+    {
+        type mixingPlane;
+        nFaces 27;
+        startFace 2200;
+        shadowPatch downstreamMixingPlanePatch;
+        zone upstreamMixingPlaneZone;
+        coordinateSystem
+        {
+            type cylindrical;
+            name mixingCS;
+            origin (0 0 0);
+            e1 (1 0 0);
+            e3 (0 0 1);
+        }
+        ribbonPatch
+        {
+            sweepAxis Theta;
+            stackAxis Z;
+            discretisation bothPatches;
+        }
+    }
+    downstreamMixingPlanePatch
+    {
+        type mixingPlane;
+        nFaces 17;
+        startFace 2227;
+        shadowPatch upstreamMixingPlanePatch;
+        zone downstreamMixingPlaneZone;
+        coordinateSystem
+        {
+            e1 (1 0 0);
+            e3 (0 0 1);
+            name mixingCS;
+            origin (0 0 0);
+            type cylindrical;
+        }
+        ribbonPatch
+        {
+            discretisation bothPatches;
+            stackAxis Z;
+            sweepAxis Theta;
+        }
+    }
+    downstreamWall
+    {
+        type symmetryPlane;
+        nFaces 850;
+        startFace 2244;
+    }
+    upstreamWall
+    {
+        type symmetryPlane;
+        nFaces 1350;
+        startFace 3094;
+    }
+    downstreamPerio1
+    {
+        type cyclicGgi;
+        nFaces 25;
+        startFace 4444;
+        shadowPatch downstreamPerio2;
+        zone downstreamPerio1Zone;
+        bridgeOverlap no;
+        rotationAxis (0 0 1);
+        rotationAngle 90;
+        separationOffset (0 0 0);
+    }
+    downstreamPerio2
+    {
+        type cyclicGgi;
+        nFaces 25;
+        startFace 4469;
+        shadowPatch downstreamPerio1;
+        zone downstreamPerio2Zone;
+        bridgeOverlap no;
+        rotationAxis (0 0 1);
+        rotationAngle -90;
+        separationOffset (0 0 0);
+    }
+);
+
+
+// ************************************************************************* //