BUGFIX: Bumped version number in ReleaseNotes and updated links to SourceForce pages. Author: Hakan Nilsson. Merge: Dominik Christ.

Changelog.current

@@ -0,0 +1,37 @@
+################################################################################
+This file contains brief description of the changes introduced by merging 
+branches
+
+There are two secions: feature and bugfix
+
+The general format should be:
+Branchname (sans "bugfix/" of "feature/" prefix)
+Author: Contributor name; Merge: Code maintainer name
+One or two lines describing the bugfix or feature
+
+################################################################################
+
+** Feature
+
+
+
+** Bugfix
+* updatePreconfiguredBoundaryTuts
+Author: Hrvoje Jasak; Merge: Dominik Christ
+Updated tutorials which use mixing plane and had broken preconfigured boundary
+files
+
+* ReleaseNotesInstallationVersionNumber
+Author: Hrvoje Jasak; Merge: Dominik Christ
+Bumped version number in ReleaseNotes and updated links to SourceForce pages
+
+* Intel14Port
+Author: Hrvoje Jasak; Merge: Dominik Christ
+Updated wmake/rules for compilation with ICC 14
+
+* processorPointPatch
+Author: Zeljko Tukovic; Merge: Dominik Christ
+Correct interpolation of point data on processor boundaries after parallel 
+topological changes
+
+

ReleaseNotes

@@ -58,7 +58,7 @@
     Please refer to doc/buildInstructions/ for details. Further
     installation instruction are available on the unofficial OpenFOAM
     Wiki:
-    http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.0
+    http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.1
     If you have improvements or build instructions for a new system,
     please share them with the community (see section "How to
     contribute", below).

ReleaseNotes.html

@@ -200,7 +200,7 @@ for the JavaScript code in this tag.
     Please refer to doc/buildInstructions/ for details. Further
     installation instruction are available on the unofficial OpenFOAM
     Wiki:
-    <a href="http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.0">http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.0</a>
+    <a href="http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.1">http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.1</a>
     If you have improvements or build instructions for a new system,
     please share them with the community (see section "How to
     contribute", below).

ReleaseNotes.txt

@@ -64,7 +64,7 @@ Table of Contents
     Please refer to doc/buildInstructions/ for details. Further
     installation instruction are available on the unofficial OpenFOAM
     Wiki:
-    [http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.0]
+    [http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.1]
     If you have improvements or build instructions for a new system,
     please share them with the community (see section "How to
     contribute", below).

ThirdParty/AllMake.stage2

@@ -68,7 +68,7 @@ then
     #( rpm_make -p openmpi-1.4.1 -s openmpi-1.4.1.spec  -u http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.1.tar.gz )
     #( rpm_make -p openmpi-1.5   -s openmpi-1.5.spec    -u http://www.open-mpi.org/software/ompi/v1.5/downloads/openmpi-1.5.tar.gz   )
     #( rpm_make -p openmpi-1.4.3 -s openmpi-1.4.3.spec  -u http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.3.tar.gz )
-     ( rpm_make -p openmpi-1.6.5 -s openmpi-1.6.5.spec  -u http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.gz )
+     ( rpm_make -p openmpi-1.6.5 -s openmpi-1.6.5.spec  -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/openmpi-1.6.5.tar.gz )
 else
     echo "Using system installed OpenMPI"
     echo ""

ThirdParty/AllMake.stage3

@@ -59,7 +59,7 @@ echo
 # Metis
 if [ -z "$METIS_SYSTEM" ]
 then
-    ( rpm_make -p metis-5.1.0 -s metis-5.1.0.spec -u http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz      )
+    ( rpm_make -p metis-5.1.0 -s metis-5.1.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/metis-5.1.0.tar.gz )
 else
     echo "Using system installed Metis"
     echo ""
@@ -69,7 +69,7 @@ fi
 if [ -z "$PARMGRIDGEN_SYSTEM" ]
 then
     #( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://www.mgnet.org/mgnet/Codes/parmgridgen/ParMGridGen-1.0.tar.gz       )
-    ( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u ftp://ftp.proxad.net/.mirrors1/ftp.freebsd.org/ports/distfiles/ParMGridGen-1.0.tar.gz       )
+    ( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParMGridGen-1.0.tar.gz )
 else
     echo "Using system installed ParMGridGen"
     echo ""
@@ -87,7 +87,7 @@ fi
 # Mesquite
 if [ -z "$MESQUITE_SYSTEM" ]
 then
-    ( rpm_make -p mesquite-2.1.2 -s mesquite-2.1.2.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.0/ThirdParty/mesquite-2.1.2.tar.gz )
+    ( rpm_make -p mesquite-2.1.2 -s mesquite-2.1.2.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/mesquite-2.1.2.tar.gz )
 else
     echo "Using system installed Mesquite"
     echo ""
@@ -102,7 +102,7 @@ fi
 # Scotch
 if [ -z "$SCOTCH_SYSTEM" ]
 then
-    ( rpm_make -p scotch-6.0.0 -s scotch-6.0.0.spec -u https://gforge.inria.fr/frs/download.php/31831/scotch-6.0.0.tar.gz  )
+    ( rpm_make -p scotch-6.0.0 -s scotch-6.0.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/scotch-6.0.0.tar.gz )
 else
     echo "Using system installed Scotch"
     echo ""
@@ -133,7 +133,7 @@ then
 #   ( rpm_make -p PyFoam-0.5.7 -s PyFoam-0.5.7.spec  -u http://openfoamwiki.net/images/d/dc/PyFoam-0.5.7.tar.gz -n PyFoam-0.5.7-1.noarch -a noarch)
 #   ( rpm_make -p PyFoam-0.6.1 -s PyFoam-0.6.1.spec  -u http://openfoamwiki.net/images/3/33/PyFoam-0.6.1.tar.gz -n PyFoam-0.6.1-1.noarch -a noarch)
 #   ( rpm_make -p PyFoam-0.6.2 -s PyFoam-0.6.2.spec  -u http://openfoamwiki.net/images/8/89/PyFoam-0.6.2.tar.gz -n PyFoam-0.6.2-1.noarch -a noarch)
-    ( rpm_make -p PyFoam-0.6.3 -s PyFoam-0.6.3.spec  -u http://openfoamwiki.net/images/e/e3/PyFoam-0.6.3-rc.tar.gz -n PyFoam-0.6.3-1.noarch -a noarch)
+    ( rpm_make -p PyFoam-0.6.3 -s PyFoam-0.6.3.spec  -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/PyFoam-0.6.1.tar.gz )
 else
     echo "Using system installed PyFoam"
     echo ""
@@ -142,7 +142,7 @@ fi
 # hwloc
 if [ -z "$HWLOC_SYSTEM" ]
 then
-    ( rpm_make -p hwloc-1.7.2 -s hwloc-1.7.2.spec  -u http://www.open-mpi.org/software/hwloc/v1.7/downloads/hwloc-1.7.2.tar.gz )
+    ( rpm_make -p hwloc-1.7.2 -s hwloc-1.7.2.spec  -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/hwloc-1.7.2.tar.gz )
 else
     echo "Using system installed hwloc"
     echo ""

ThirdParty/AllMake.stage4

@@ -73,7 +73,7 @@ then
 
     if [ -d "$QT_BIN_DIR" -a -r "$QT_BIN_DIR"/qmake ]
     then
-        ( rpm_make -p ParaView-4.0.1 -s ParaView-4.0.1.spec -u http://www.paraview.org/files/v4.0/ParaView-v4.0.1-source.tgz \
+        ( rpm_make -p ParaView-4.0.1 -s ParaView-4.0.1.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.0.1-source.tgz \
             -f --define='_qmakePath $QT_BIN_DIR/qmake'
         )
     else

doc/buildInstructions/README

@@ -1,13 +1,12 @@
 Here you can find build instructions for foam-extend-3.1 . The instructions for
 different Linux distributions are in corresponding sub-folders. If you need to
 take different or additional steps to get foam-extend compiled on your machine,
-please file a bug at http://sourceforge.net/apps/mantisbt/openfoam-extend/.
+please file a bug at https://sourceforge.net/p/openfoam-extend/ticketsfoamextendrelease/.
 
 If you compiled/installed on a Linux distribution that is not listed here,
-please contribute to the project and submit installation instructions. Contact
+please contribute to the project and submit installation instructions.
-the project admins on http://sourceforge.net/projects/openfoam-extend/ for
+For instructions, see: https://sourceforge.net/p/openfoam-extend/wiki/HowToContribute/
-details.
 
 Please also refer to the unofficial OpenFOAM Wiki for additional installation
 instructions:
-http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.0
+http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.1

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);
+    }
+);
+
+
+// ************************************************************************* //