Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.3.x

tutorials/combustion/engineFoam/kivaTest/Allclean

@@ -5,9 +5,11 @@ cd ${0%/*} || exit 1    # run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 mv ./-180 temp180
-rm -rf 0
-cp system/controlDict.1st system/controlDict
 cleanCase
+
+rm -rf 0 > /dev/null 2>&1
+rm -f constant/polyMesh/boundary > /dev/null 2>&1
+
 mv temp180 ./-180
 
 # ----------------------------------------------------------------- end-of-file

tutorials/combustion/engineFoam/kivaTest/Allrun

@@ -9,12 +9,6 @@ application=`getApplication`
 
 runApplication kivaToFoam -file otape17
 
-cp system/controlDict.1st system/controlDict
 runApplication $application
-mv log.$application log.$application.1
-
-cp system/controlDict.2nd system/controlDict
-runApplication $application
-mv log.$application log.$application.2
 
 # ----------------------------------------------------------------- end-of-file

tutorials/combustion/engineFoam/kivaTest/system/controlDict

@@ -23,7 +23,7 @@ startTime       -180;
 
 stopAt          endTime;
 
-endTime         -15;
+endTime         60;
 
 deltaT          0.25;
 
@@ -51,5 +51,26 @@ maxCo           0.2;
 
 maxDeltaT       1;
 
+functions
+{
+    timeStep
+    {
+        type coded;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        redirectType setDeltaT;
+
+        code
+        #{
+            const Time& runTime = mesh().time();
+            if (runTime.timeToUserTime(runTime.value()) >= -15.0)
+            {
+                const_cast<Time&>(runTime).setDeltaT
+                (
+                    runTime.userTimeToTime(0.025)
+                );
+            }
+        #};
+    }
+}
 
 // ************************************************************************* //

tutorials/incompressible/simpleFoam/windAroundBuildings/0/U

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -9,47 +9,38 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       volVectorField;
-    location    "system";
+    object      U;
-    object      controlDict.1st;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     engineFoam;
+Uinlet          (10 0 0);
 
-startFrom       startTime;
+dimensions      [0 1 -1 0 0 0 0];
 
-startTime       -180;
+internalField   uniform (0 0 0);
 
-stopAt          endTime;
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform $Uinlet;
+    }
 
-endTime         -15;
+    outlet
+    {
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
+    }
 
-deltaT          0.25;
+    wall
-
+    {
-writeControl    runTime;
+        type            fixedValue;
-
+        value           uniform (0 0 0);
-writeInterval   5;
+    }
-
-purgeWrite      0;
-
-writeFormat     ascii;
-
-writePrecision  6;
-
-writeCompression off;
-
-timeFormat      general;
-
-timePrecision   6;
-
-runTimeModifiable true;
-
-adjustTimeStep  no;
-
-maxCo           0.2;
-
-maxDeltaT       1;
 
+    #includeEtc "caseDicts/setConstraintTypes"
+}
 
 // ************************************************************************* //

tutorials/incompressible/simpleFoam/windAroundBuildings/0/epsilon

@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+epsilonInlet  0.03; // Cmu^0.75 * k^1.5 / L ; L =10
+
+dimensions      [0 2 -3 0 0 0 0];
+
+internalField   uniform $epsilonInlet;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform $epsilonInlet;
+    }
+
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform $epsilonInlet;
+        value           uniform $epsilonInlet;
+    }
+
+    wall
+    {
+        type            epsilonWallFunction;
+        value           uniform $epsilonInlet;
+    }
+
+    #includeEtc "caseDicts/setConstraintTypes"
+}
+
+// ************************************************************************* //

tutorials/incompressible/simpleFoam/windAroundBuildings/0/k

@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+kInlet          1.5;   // approx k = 1.5*(I*U)^2 ; I = 0.1
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform $kInlet;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform $kInlet;
+    }
+
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform $kInlet;
+        value           uniform $kInlet;
+    }
+
+    wall
+    {
+        type            kqRWallFunction;
+        value           uniform $kInlet;
+    }
+
+    #includeEtc "caseDicts/setConstraintTypes"
+}
+
+// ************************************************************************* //

tutorials/incompressible/simpleFoam/windAroundBuildings/0/nut

@@ -0,0 +1,44 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+
+    wall
+    {
+        type            nutkWallFunction;
+        value           uniform 0;
+    }
+
+    #includeEtc "caseDicts/setConstraintTypes"
+}
+
+// ************************************************************************* //

tutorials/incompressible/simpleFoam/windAroundBuildings/0/p

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -9,32 +9,36 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
+    class       volScalarField;
-    location    "constant/polyMesh";
+    object      p;
-    object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-3
+dimensions      [0 2 -2 0 0 0 0];
-(
+
-    piston
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
     {
-        type            wall;
+        type            zeroGradient;
-        nFaces          1326;
-        startFace       79522;
     }
-    liner
+
+    outlet
     {
-        type            wall;
+        type            totalPressure;
-        nFaces          2710;
+        p0              uniform 0;
-        startFace       80848;
+        gamma           1.4;
+        value           uniform 0;
     }
-    cylinderHead
+
+    wall
     {
-        type            wall;
+        type            zeroGradient;
-        nFaces          2184;
-        startFace       83558;
     }
-)
+
+    #includeEtc "caseDicts/setConstraintTypes"
+}
 
 // ************************************************************************* //

tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean

@@ -0,0 +1,13 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+rm -f constant/triSurface/buildings.eMesh > /dev/null 2>&1
+rm -f constant/polyMesh/boundary > /dev/null 2>&1
+
+# ----------------------------------------------------------------- end-of-file

tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun

@@ -0,0 +1,14 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+runApplication surfaceFeatureExtract
+
+runApplication blockMesh
+runApplication snappyHexMesh -overwrite
+
+runApplication $(getApplication)
+
+# ----------------------------------------------------------------- end-of-file

tutorials/incompressible/simpleFoam/windAroundBuildings/constant/RASProperties

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,36 +10,14 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
+    object      RASProperties;
-    object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-defaultFieldValues
+RASModel        kEpsilon;
-(
-    volScalarFieldValue alpha.water 0
-);
 
-regions
+turbulence      on;
-(
-    boxToCell
-    {
-        box (0 0 0) (50 130 27);
-        fieldValues
-        (
-            volScalarFieldValue alpha.water 1
-        );
-    }
-
-    boxToFace
-    {
-        box (0 0 0) (50 10.0001 24);
-        fieldValues
-        (
-            volScalarFieldValue alpha.water 1
-        );
-    }
-);
 
+printCoeffs     on;
 
 // ************************************************************************* //

tutorials/incompressible/simpleFoam/windAroundBuildings/constant/polyMesh/blockMeshDict

@@ -0,0 +1,106 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+backgroundMesh
+{
+    xMin   -20; // L = 350
+    xMax   330;
+    yMin   -50; // L = 280
+    yMax   230;
+    zMin     0;
+    zMax   140;
+    xCells  25;
+    yCells  20;
+    zCells  10;
+}
+
+convertToMeters 1;
+
+vertices
+(
+    ($:backgroundMesh.xMin $:backgroundMesh.yMin $:backgroundMesh.zMin)
+    ($:backgroundMesh.xMax $:backgroundMesh.yMin $:backgroundMesh.zMin)
+    ($:backgroundMesh.xMax $:backgroundMesh.yMax $:backgroundMesh.zMin)
+    ($:backgroundMesh.xMin $:backgroundMesh.yMax $:backgroundMesh.zMin)
+
+    ($:backgroundMesh.xMin $:backgroundMesh.yMin $:backgroundMesh.zMax)
+    ($:backgroundMesh.xMax $:backgroundMesh.yMin $:backgroundMesh.zMax)
+    ($:backgroundMesh.xMax $:backgroundMesh.yMax $:backgroundMesh.zMax)
+    ($:backgroundMesh.xMin $:backgroundMesh.yMax $:backgroundMesh.zMax)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7)
+    (
+        $:backgroundMesh.xCells
+        $:backgroundMesh.yCells
+        $:backgroundMesh.zCells
+    )
+    simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 3 7 4)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (1 5 6 2)
+        );
+    }
+
+    ground
+    {
+        type wall;
+        faces
+        (
+            (0 1 2 3)
+        );
+    }
+
+    frontAndBack
+    {
+        type symmetry;
+        faces
+        (
+            (0 4 5 1)
+            (3 2 6 7)
+            (4 7 6 5)
+        );
+    }
+
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //

tutorials/incompressible/simpleFoam/windAroundBuildings/constant/transportProperties

@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+transportModel  Newtonian;
+
+nu              nu [ 0 2 -1 0 0 0 0 ] 1.5e-05;
+
+// ************************************************************************* //

tutorials/incompressible/simpleFoam/windAroundBuildings/system/controlDict

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,26 +10,25 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
+    object      controlDict;
-    object      controlDict.2nd;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     engineFoam;
+application     simpleFoam;
 
-startFrom       startTime;
+startFrom       latestTime;
 
-startTime       -15;
+startTime       0;
 
 stopAt          endTime;
 
-endTime         60;
+endTime         400;
 
-deltaT          0.025;
+deltaT          1;
 
-writeControl    runTime;
+writeControl    timeStep;
 
-writeInterval   5;
+writeInterval   50;
 
 purgeWrite      0;
 
@@ -45,11 +44,12 @@ timePrecision   6;
 
 runTimeModifiable true;
 
-adjustTimeStep  no;
+// adjustTimeStep  yes;
 
-maxCo           0.2;
+// maxCo           1;
-
-maxDeltaT       1;
 
+functions
+{
+}
 
 // ************************************************************************* //

tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSchemes

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,29 +10,36 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 ddtSchemes
 {
-    default         localEuler rDeltaT;
+    default         steadyState;
 }
 
 gradSchemes
 {
     default         Gauss linear;
+
+    limited         cellLimited Gauss linear 1;
+    grad(U)         $limited;
+    grad(k)         $limited;
+    grad(epsilon)     $limited;
 }
 
 divSchemes
 {
-    div(rhoPhi,U)  Gauss linearUpwind grad(U);
+    default         none;
-    div(phi,alpha)  Gauss vanLeer;
+
-    div(phirb,alpha) Gauss linear;
+    div(phi,U)      bounded Gauss linearUpwind limited;
-    div(phi,k)      Gauss upwind;
+
-    div(phi,omega)  Gauss upwind;
+    turbulence      bounded Gauss limitedLinear 1;
-    div((muEff*dev(T(grad(U))))) Gauss linear;
+    div(phi,k)      $turbulence;
+    div(phi,epsilon) $turbulence;
+
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -53,10 +60,7 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    p_rgh;
+    p               ;
-    pcorr;
-    alpha.water;
 }
 
-
 // ************************************************************************* //

tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSolution

@@ -0,0 +1,72 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver          GAMG;
+        smoother        GaussSeidel;
+        cacheAgglomeration on;
+        agglomerator    faceAreaPair;
+        nCellsInCoarsestLevel 10;
+        mergeLevels     1;
+        tolerance       1e-6;
+        relTol          0.1;
+    }
+
+    "(U|k|omega|epsilon)"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-6;
+        relTol          0.1;
+    }
+}
+
+SIMPLE
+{
+    residualControl
+    {
+        p               1e-4;
+        U               1e-4;
+        "(k|omega|epsilon)" 1e-4;
+    }
+    nNonOrthogonalCorrectors 0;
+    pRefCell        0;
+    pRefValue       0;
+
+}
+
+potentialFlow
+{
+    nNonOrthogonalCorrectors 10;
+}
+
+relaxationFactors
+{
+    fields
+    {
+        p               0.3;
+    }
+    equations
+    {
+        U               0.7;
+        "(k|omega|epsilon).*" 0.7;
+    }
+}
+
+// ************************************************************************* //

tutorials/incompressible/simpleFoam/windAroundBuildings/system/meshQualityDict

@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      meshQualityDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#includeEtc "caseDicts/mesh/generation/meshQualityDict.cfg"
+
+//- minFaceWeight (0 -> 0.5)
+//minFaceWeight 0.02;
+
+// ************************************************************************* //

tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict

@@ -0,0 +1,102 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      snappyHexMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#includeEtc "caseDicts/mesh/generation/snappyHexMeshDict.cfg"
+
+castellatedMesh on;
+snap            on;
+addLayers       off;
+
+geometry
+{
+    buildings.obj
+    {
+        type triSurfaceMesh;
+        name buildings;
+    }
+
+    refinementBox
+    {
+        type searchableBox;
+        min  (  0   0   0);
+        max  (250 180  90);
+    }
+};
+
+castellatedMeshControls
+{
+    features
+    (
+      { file  "buildings.eMesh"; level 1; }
+    );
+
+    refinementSurfaces
+    {
+        buildings
+        {
+            level (3 3);
+            patchInfo { type wall; }
+        }
+    }
+
+    refinementRegions
+    {
+        refinementBox
+        {
+            mode inside;
+            levels ((1E15 2));
+        }
+    }
+
+    locationInMesh (1 1 1);
+}
+
+snapControls
+{
+    explicitFeatureSnap    true;
+    implicitFeatureSnap    false;
+}
+
+addLayersControls
+{
+    layers
+    {
+        "CAD.*"
+        {
+            nSurfaceLayers 2;
+        }
+    }
+
+    relativeSizes       true;
+    expansionRatio      1.2;
+    finalLayerThickness 0.5;
+    minThickness        1e-3;
+}
+
+meshQualityControls
+{
+}
+
+writeFlags
+(
+    scalarLevels
+    layerSets
+    layerFields
+);
+
+mergeTolerance 1e-6;
+
+// ************************************************************************* //

tutorials/incompressible/simpleFoam/windAroundBuildings/system/surfaceFeatureExtractDict

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -9,36 +9,14 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       polyBoundaryMesh;
+    class       dictionary;
-    object      boundary;
+    object      surfaceFeatureExtractDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-3
+buildings.obj
-(
-piston
 {
-    type wall;
+    #includeEtc "caseDicts/surface/surfaceFeatureExtractDict.cfg"
-    physicalType fixedTemperatureMovingWallFunctions;
-    nFaces 1326;
-    startFace 79522;
 }
 
-liner
-{
-    type wall;
-    physicalType fixedTemperatureWallFunctions;
-    nFaces 2710;
-    startFace 80848;
-}
-
-cylinderHead
-{
-    type wall;
-    physicalType fixedTemperatureWallFunctions;
-    nFaces 2184;
-    startFace 83558;
-}
-)
-
 // ************************************************************************* //

tutorials/multiphase/interFoam/ras/waterChannel/0/U

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -16,7 +16,7 @@ FoamFile
 
 dimensions      [0 1 -1 0 0 0 0];
 
-internalField   uniform (2 0 0);
+internalField   uniform (1 0 0);
 
 boundaryField
 {

tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/ras/waterChannel/0/k

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/ras/waterChannel/0/nut

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/ras/waterChannel/0/omega

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/ras/waterChannel/Allmesh

@@ -0,0 +1,20 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+application=`getApplication`
+
+runApplication blockMesh
+
+echo "Creating channel"
+i=1
+while [ "$i" -lt 3 ] ; do
+    cp system/extrudeMeshDict.${i} system/extrudeMeshDict
+    echo "Running extrudeMesh, instance" ${i}
+    extrudeMesh > log.extrudeMesh.${i}
+    i=`expr $i + 1`
+done
+
+# ----------------------------------------------------------------- end-of-file

tutorials/multiphase/interFoam/ras/waterChannel/Allrun

@@ -6,16 +6,7 @@ cd ${0%/*} || exit 1    # run from this directory
 
 application=`getApplication`
 
-runApplication blockMesh
+./Allmesh
-
-echo "Creating channel"
-i=1
-while [ "$i" -lt 3 ] ; do
-    cp system/extrudeMeshDict.${i} system/extrudeMeshDict
-    echo "Running extrudeMesh, instance" ${i}
-    extrudeMesh > log.extrudeMesh.${i}
-    i=`expr $i + 1`
-done
 
 cp 0/alpha.water.org 0/alpha.water
 runApplication setFields

tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/controlDict

@@ -1,86 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-application     LTSInterFoam;
-
-startFrom       latestTime;
-
-startTime       0;
-
-stopAt          endTime;
-
-endTime         5000;
-
-deltaT          1;
-
-writeControl    timeStep;
-
-writeInterval   200;
-
-purgeWrite      0;
-
-writeFormat     ascii;
-
-writePrecision  6;
-
-writeCompression compressed;
-
-timeFormat      general;
-
-timePrecision   6;
-
-runTimeModifiable yes;
-
-adjustTimeStep  yes;
-maxCo           0.5;
-maxAlphaCo      0.5;
-maxDeltaT       1;
-
-functions
-{
-    inletFlux
-    {
-        type            faceSource;
-        functionObjectLibs ("libfieldFunctionObjects.so");
-        outputControl   timeStep;
-        log             true;
-        // Output field values as well
-        valueOutput     false;
-        source          patch;
-        sourceName      inlet;
-        operation       sum;
-
-        fields
-        (
-            rhoPhi
-        );
-    }
-
-    outletFlux
-    {
-        $inletFlux;
-        sourceName      outlet;
-    }
-
-    atmosphereFlux
-    {
-        $inletFlux;
-        sourceName      atmosphere;
-    }
-}
-
-// ************************************************************************* //

tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution

@@ -1,101 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
-    alpha.water
-    {
-        nAlphaCorr      1;
-        nAlphaSubCycles 3;
-        cAlpha          1;
-    }
-
-    pcorr
-    {
-        solver          PCG;
-        preconditioner
-        {
-            preconditioner  GAMG;
-            tolerance       1e-05;
-            relTol          0;
-            smoother        DICGaussSeidel;
-            nPreSweeps      0;
-            nPostSweeps     2;
-            nFinestSweeps   2;
-            cacheAgglomeration true;
-            nCellsInCoarsestLevel 10;
-            agglomerator    faceAreaPair;
-            mergeLevels     1;
-        }
-        tolerance       1e-05;
-        relTol          0;
-        maxIter         100;
-    }
-
-    p_rgh
-    {
-        $pcorr;
-        tolerance       1e-6;
-        relTol          0.01;
-    };
-
-    p_rghFinal
-    {
-        $p_rgh;
-        tolerance       1e-6;
-        relTol          0;
-    }
-
-    "(U|k|omega).*"
-    {
-        solver          smoothSolver;
-
-        smoother        GaussSeidel;
-        nSweeps         1;
-
-        tolerance       1e-7;
-        relTol          0.1;
-    };
-}
-
-PIMPLE
-{
-    momentumPredictor no;
-    nCorrectors     2;
-    nNonOrthogonalCorrectors 0;
-
-    maxCo           0.5;
-    maxAlphaCo      0.2;
-    nAlphaSweepIter 1;
-
-    rDeltaTSmoothingCoeff 0.1;
-    rDeltaTDampingCoeff 1;
-    maxDeltaT       100;
-}
-
-relaxationFactors
-{
-    fields
-    {
-    }
-    equations
-    {
-    }
-}
-
-
-// ************************************************************************* //

tutorials/multiphase/interFoam/ras/waterChannel/README

@@ -1,5 +1,5 @@
 - This case uses blockMesh and extrudeMesh to create a channel geometry.
-  - See Allrun script to generate geometry.
+  - See Allmesh script to generate geometry.
 - The case is set up to run with interFoam.
 - For running with LTSInterFoam, an alternative set of main files from
   system directory (controlDict, etc) are included in LTSInterFoam

tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/ras/waterChannel/constant/g

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/ras/waterChannel/constant/polyMesh/blockMeshDict

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -23,7 +23,7 @@ startTime       0;
 
 stopAt          endTime;
 
-endTime         100;
+endTime         200;
 
 deltaT          0.1;
 

tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.1

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -28,7 +28,7 @@ expansionRatio      1.0;
 linearDirectionCoeffs
 {
     axisPt          (0 0 0);
-    direction       (1 0.2 -0.02);
+    direction       (1 0.2 0.02);
     thickness       60;
 }
 

tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.2

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -28,7 +28,7 @@ expansionRatio      1.0;
 linearDirectionCoeffs
 {
     axisPt          (0 0 0);
-    direction       (1 -0.2 -0.02);
+    direction       (1 -0.2 -0.03);
     thickness       40;
 }
 

tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -24,7 +24,7 @@ regions
 (
     boxToCell
     {
-        box (-10 -20 -10) (200 20 4);
+        box (-10 -20 -10) (50 20 2.2);
         fieldValues
         (
             volScalarFieldValue alpha.water 1