Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C

@@ -46,11 +46,14 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    timeSelector::addOptions();
+    #include "addRegionOption.H"
+
     #include "setRootCase.H"
 
     #include "createTime.H"
     instantList timeDirs = timeSelector::select0(runTime, args);
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
     #include "createFields.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/combustion/XiFoam/les/Allrun

@@ -0,0 +1,17 @@
+#!/bin/sh
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Get application name from directory
+application="XiFoam"
+
+cases=" \
+pitzDaily \
+pitzDaily3D
+"
+
+for i in $cases; do
+    blockMesh -case $i
+    $application -case $i
+done
+

tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs

@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      alphaSgs;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet           
+    {
+        type            zeroGradient;
+    }
+
+    outlet          
+    {
+        type            zeroGradient;
+    }
+
+    upperWall       
+    {
+        type            zeroGradient;
+    }
+
+    lowerWall       
+    {
+        type            zeroGradient;
+    }
+
+    frontAndBack    
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //

tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs

@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      alphaSgs;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet           
+    {
+        type            zeroGradient;
+    }
+
+    outlet          
+    {
+        type            zeroGradient;
+    }
+
+    upperWall       
+    {
+        type            zeroGradient;
+    }
+
+    lowerWall       
+    {
+        type            zeroGradient;
+    }
+
+    frontAndBack    
+    {
+        type            cyclic;
+    }
+}
+
+// ************************************************************************* //

tutorials/combustion/dieselFoam/aachenBomb/0/alphat

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            alphatWallFunction;
+        type            compressible::alphatWallFunction;
         value           uniform 0;
     }
 }

tutorials/combustion/dieselFoam/aachenBomb/0/epsilon

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 90;
     }
 }

tutorials/combustion/dieselFoam/aachenBomb/0/k

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 1;
     }
 }

tutorials/combustion/dieselFoam/aachenBomb/0/mut

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

tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties

@@ -15,9 +15,11 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+
 chemistry       off;
 
-chemistrySolver ODE;
+chemistrySolver ode;
 
 initialChemicalTimeStep 1e-07;
 
@@ -32,7 +34,7 @@ EulerImplicitCoeffs
     equilibriumRateLimiter off;
 }
 
-ODECoeffs
+odeCoeffs
 {
     ODESolver       SIBS;
     eps             0.05;

tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hMixtureThermo<reactingMixture>;
+thermoType      hPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
 
 CHEMKINFile     "$FOAM_CASE/chemkin/chem.inp";
 

tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat

@@ -23,22 +23,22 @@ boundaryField
 {
     front
     {
-        type            alphatWallFunction;
+        type            compressible::alphatWallFunction;
         value           uniform 0;
     }
     back
     {
-        type            alphatWallFunction;
+        type            compressible::alphatWallFunction;
         value           uniform 0;
     }
     wall
     {
-        type            alphatWallFunction;
+        type            compressible::alphatWallFunction;
         value           uniform 0;
     }
     porosityWall
     {
-        type            alphatWallFunction;
+        type            compressible::alphatWallFunction;
         value           uniform 0;
     }
     inlet

tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon

@@ -23,27 +23,27 @@ boundaryField
 {
     front
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 200;
     }
     back
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 200;
     }
     wall
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 200;
     }
     porosityWall
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 200;
     }
     inlet
     {
-        type            turbulentMixingLengthDissipationRateInlet;
+        type            compressible::turbulentMixingLengthDissipationRateInlet;
         mixingLength    0.005;
         value           uniform 200;
     }

tutorials/compressible/rhoPimpleFoam/angledDuct/0/k

@@ -23,22 +23,22 @@ boundaryField
 {
     front
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 1;
     }
     back
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 1;
     }
     wall
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 1;
     }
     porosityWall
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 1;
     }
     inlet

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p

@@ -22,25 +22,25 @@ boundaryField
 {
     floor
     {
-        type            calculated;
+        type            fixedFluxBuoyantPressure;
         value           uniform 100000;
     }
 
     ceiling
     {
-        type            calculated;
+        type            fixedFluxBuoyantPressure;
         value           uniform 100000;
     }
 
     fixedWalls
     {
-        type            calculated;
+        type            fixedFluxBuoyantPressure;
         value           uniform 100000;
     }
 
     box
     {
-        type            calculated;
+        type            fixedFluxBuoyantPressure;
         value           uniform 100000;
     }
 }

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd

@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      pd;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -2 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    floor
-    {
-        type            fixedFluxBuoyantPressure;
-        value           uniform 0;
-    }
-
-    ceiling
-    {
-        type            fixedFluxBuoyantPressure;
-        value           uniform 0;
-    }
-
-    fixedWalls
-    {
-        type            fixedFluxBuoyantPressure;
-        value           uniform 0;
-    }
-
-    box
-    {
-        type            fixedFluxBuoyantPressure;
-        value           uniform 0;
-    }
-}
-
-// ************************************************************************* //

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes

@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),pd) Gauss linear corrected;
+    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
@@ -62,7 +62,7 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd              ;
+    p;
 }
 
 

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution

@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    pd
+    p
     {
         solver          PCG;
         preconditioner  DIC;
@@ -69,14 +69,14 @@ solvers
 SIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    pdRefCell       0;
+    pRefCell       0;
-    pdRefValue      0;
+    pRefValue      0;
 }
 
 relaxationFactors
 {
     rho             1;
-    pd              0.3;
+    p               0.3;
     U               0.7;
     h               0.7;
     k               0.7;

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p

@@ -22,25 +22,25 @@ boundaryField
 {
     floor
     {
-        type            calculated;
+        type            fixedFluxBuoyantPressure;
         value           uniform 100000;
     }
 
     ceiling
     {
-        type            calculated;
+        type            fixedFluxBuoyantPressure;
         value           uniform 100000;
     }
 
     fixedWalls
     {
-        type            calculated;
+        type            fixedFluxBuoyantPressure;
         value           uniform 100000;
     }
 
     box
     {
-        type            calculated;
+        type            fixedFluxBuoyantPressure;
         value           uniform 100000;
     }
 }

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/pd

@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      pd;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -2 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    floor
-    {
-        type            fixedFluxBuoyantPressure;
-        value           uniform 0;
-    }
-
-    ceiling
-    {
-        type            fixedFluxBuoyantPressure;
-        value           uniform 0;
-    }
-
-    fixedWalls
-    {
-        type            fixedFluxBuoyantPressure;
-        value           uniform 0;
-    }
-
-    box
-    {
-        type            fixedFluxBuoyantPressure;
-        value           uniform 0;
-    }
-}
-
-// ************************************************************************* //

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes

@@ -42,7 +42,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),pd) Gauss linear corrected;
+    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
@@ -63,7 +63,7 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd              ;
+    p;
 }
 
 

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution

@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    pd
+    p
     {
         solver          GAMG;
         tolerance       1e-06;
@@ -73,14 +73,14 @@ solvers
 SIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    pdRefCell       0;
+    pRefCell       0;
-    pdRefValue      0;
+    pRefValue      0;
 }
 
 relaxationFactors
 {
     rho             1.0;
-    pd              0.3;
+    p               0.3;
     U               0.7;
     h               0.7;
     k               0.7;

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun

@@ -15,13 +15,13 @@ runApplication splitMeshRegions -cellZones
 
 for i in bottomAir topAir heater leftSolid rightSolid
 do
-   changeDictionary -region $i
+   changeDictionary -region $i >& log.changeDictionary.$i
 done
 
 # remove fluid fields from solid regions (important for post-processing)
 for i in heater leftSolid rightSolid
 do
-   rm -f 0*/$i/{mut,alphat,epsilon,k,p,pd,U}
+   rm -f 0*/$i/{mut,alphat,epsilon,k,p,p,U}
 done
 
 # remove solid fields from fluid regions (important for post-processing)
@@ -37,7 +37,7 @@ done
 # Decompose
 for i in bottomAir topAir heater leftSolid rightSolid
 do
-   decomposePar -region $i
+   decomposePar -region $i >& log.decomposePar.$i
 done
 
 # Run
@@ -47,7 +47,7 @@ runParallel chtMultiRegionFoam 4 system/machines
 # Reconstruct
 for i in bottomAir topAir heater leftSolid rightSolid
 do
-   reconstructPar -region $i
+   reconstructPar -region $i >& log.reconstructPar.$i
 done
 
 

tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh

@@ -1,11 +1,13 @@
 #!/bin/sh
+set -x
 
 m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
-blockMesh
+blockMesh >& log.blockMesh
-cellSet
+cellSet >& log.cellSet
+
 #- MRF determines its own faceZone if not supplied
 #cp system/faceSetDict_rotorFaces system/faceSetDict
 #faceSet
 #cp system/faceSetDict_noBoundaryFaces system/faceSetDict
 #faceSet
-setsToZones -noFlipMap
+setsToZones -noFlipMap >& log.setsToZones

tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties

@@ -17,7 +17,7 @@ FoamFile
 
 radiation       off;
 
-radiationModel  noRadiation;
+radiationModel  none;
 
 solverFreq      10;
 

tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options

@@ -4,9 +4,10 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -llagrangian \
@@ -15,7 +16,7 @@ EXE_LIBS = \
     -lmeshTools \
     -lthermophysicalFunctions \
     -lbasicThermophysicalModels \
-    -lcombustionThermophysicalModels \
+    -lreactionThermophysicalModels \
     -lspecie \
     -lradiation \
     -lcompressibleRASModels \

tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/UEqn.H

@@ -4,8 +4,8 @@
       + fvm::div(phi, U)
       + turbulence->divDevRhoReff(U)
      ==
-        thermoCloud1.SU1()
+        thermoCloud1.SU()
-      + kinematicCloud1.SU1()
+      + kinematicCloud1.SU()
       + rho.dimensionedInternalField()*g
     );
 

tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H

@@ -5,7 +5,7 @@
         rho,
         U,
         g,
-        thermo()
+        thermo
     );
 
     Info<< "Constructing kinematicCloud1" << endl;
@@ -14,7 +14,7 @@
         "kinematicCloud1",
         rho,
         U,
-        thermo().mu(),
+        thermo.mu(),
         g
     );
 

tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H

@@ -1,13 +1,14 @@
     Info<< "Reading thermophysical properties\n" << endl;
 
-    autoPtr<basicThermo> thermo
+    autoPtr<basicPsiThermo> pThermo
     (
-        basicThermo::New(mesh)
+        basicPsiThermo::New(mesh)
     );
+    basicPsiThermo& thermo = pThermo();
 
-    volScalarField& p = thermo->p();
+    volScalarField& p = thermo.p();
-    volScalarField& h = thermo->h();
+    volScalarField& h = thermo.h();
-    const volScalarField& psi = thermo->psi();
+    const volScalarField& psi = thermo.psi();
 
     volScalarField rho
     (
@@ -19,7 +20,7 @@
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        thermo->rho()
+        thermo.rho()
     );
 
     Info<< "\nReading field U\n" << endl;
@@ -48,7 +49,7 @@
             rho,
             U,
             phi,
-            thermo()
+            thermo
         )
     );
 

tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hEqn.H

@@ -6,12 +6,12 @@
       - fvm::laplacian(turbulence->alphaEff(), h)
      ==
         DpDt
-      + thermoCloud1.Sh1()
+      + thermoCloud1.Sh()
     );
 
     hEqn.relax();
 
     hEqn.solve();
 
-    thermo->correct();
+    thermo.correct();
 }

tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H

@@ -1,4 +1,4 @@
-rho = thermo->rho();
+rho = thermo.rho();
 
 volScalarField rUA = 1.0/UEqn.A();
 U = rUA*UEqn.H();
@@ -8,7 +8,7 @@ if (transonic)
     surfaceScalarField phid
     (
         "phid",
-        fvc::interpolate(thermo->psi())
+        fvc::interpolate(psi)
        *(
             (fvc::interpolate(U) & mesh.Sf())
           + fvc::ddtPhiCorr(rUA, rho, U, phi)
@@ -35,8 +35,8 @@ if (transonic)
 else
 {
     phi =
-        fvc::interpolate(rho)*
+        fvc::interpolate(rho)
-        (
+       *(
             (fvc::interpolate(U) & mesh.Sf())
           + fvc::ddtPhiCorr(rUA, rho, U, phi)
         );

tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C

@@ -31,7 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
 #include "turbulenceModel.H"
 
 #include "basicThermoCloud.H"
@@ -41,62 +41,59 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "setRootCase.H"
 
-#   include "setRootCase.H"
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "readEnvironmentalProperties.H"
+    #include "createFields.H"
+    #include "createClouds.H"
+    #include "readPISOControls.H"
+    #include "initContinuityErrs.H"
+    #include "readTimeControls.H"
+    #include "compressibleCourantNo.H"
+    #include "setInitialDeltaT.H"
 
-#   include "createTime.H"
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#   include "createMesh.H"
-#   include "readEnvironmentalProperties.H"
-#   include "createFields.H"
-#   include "createClouds.H"
-#   include "readPISOControls.H"
-#   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
-#   include "compressibleCourantNo.H"
-#   include "setInitialDeltaT.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
     {
-#       include "readTimeControls.H"
+        #include "readTimeControls.H"
-#       include "readPISOControls.H"
+        #include "readPISOControls.H"
-#       include "compressibleCourantNo.H"
+        #include "compressibleCourantNo.H"
-#       include "setDeltaT.H"
+        #include "setDeltaT.H"
 
         runTime++;
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        Info<< "Evolving thermoCloud1" << endl;
         thermoCloud1.evolve();
         thermoCloud1.info();
 
-        Info<< "Evolving kinematicCloud1" << endl;
         kinematicCloud1.evolve();
         kinematicCloud1.info();
 
 
-#       include "rhoEqn.H"
+        #include "rhoEqn.H"
 
         // --- PIMPLE loop
         for (int ocorr=1; ocorr<=nOuterCorr; ocorr++)
         {
-#           include "UEqn.H"
+            #include "UEqn.H"
 
             // --- PISO loop
             for (int corr=1; corr<=nCorr; corr++)
             {
-#               include "hEqn.H"
+                #include "hEqn.H"
-#               include "pEqn.H"
+                #include "pEqn.H"
             }
         }
 
         turbulence->correct();
 
-        rho = thermo->rho();
+        rho = thermo.rho();
 
         runTime.write();
 

tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/epsilon

@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
+|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      epsilon;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,28 +23,28 @@ boundaryField
 {
     top
     {
-        type            zeroGradient;
+        type            compressible::epsilonWallFunction;
+        value           uniform 5390.5;
     }
-
     bottom
     {
-        type            zeroGradient;
+        type            compressible::epsilonWallFunction;
+        value           uniform 5390.5;
     }
-
     walls
     {
-        type            zeroGradient;
+        type            compressible::epsilonWallFunction;
+        value           uniform 5390.5;
     }
-
     symmetry
     {
         type            symmetryPlane;
     }
-
     frontAndBack
     {
         type            empty;
     }
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k

@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
+|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,28 +23,28 @@ boundaryField
 {
     top
     {
-        type            zeroGradient;
+        type            compressible::kQRWallFunction;
+        value           uniform 37.5;
     }
-
     bottom
     {
-        type            zeroGradient;
+        type            compressible::kQRWallFunction;
+        value           uniform 37.5;
     }
-
     walls
     {
-        type            zeroGradient;
+        type            compressible::kQRWallFunction;
+        value           uniform 37.5;
     }
-
     symmetry
     {
         type            symmetryPlane;
     }
-
     frontAndBack
     {
         type            empty;
     }
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties

@@ -21,20 +21,27 @@ DragModel       SphereDrag;
 
 DispersionModel StochasticDispersionRAS;
 
-WallInteractionModel StandardWallInteraction;
+PatchInteractionModel StandardWallInteraction;
 
-minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
+PostProcessingModel none;
-
-rho0            rho0 [ 1 -3 0 0 0 ] 5000;
 
 coupled         true;
 
+cellValueSourceCorrection on;
+
 parcelTypeId    2;
 
+constantProperties
+{
+    rhoMin          rhoMin [ 1 -3 0 0 0 ] 1e-15;
+    minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
+    rho0            rho0 [ 1 -3 0 0 0 ] 5000;
+}
+
 interpolationSchemes
 {
     rho             cell;
-    U               cellPointFace;
+    U               cellPoint;
     mu              cell;
 }
 
@@ -43,12 +50,21 @@ integrationSchemes
     U               Euler;
 }
 
+particleForces
+{
+    gravity         on;
+    virtualMass     off;
+    Cvm             0.5;
+    pressureGradient off;
+    gradU           gradU;
+}
+
 ManualInjectionCoeffs
 {
-    parcelBasisType mass;
     massTotal       massTotal [ 1 0 0 0 0 ] 0.0002;
+    parcelBasisType mass;
     SOI             0;
-    positionsFile   kinematicCloud1Positions;
+    positionsFile   "kinematicCloud1Positions";
     U0              ( 0 0 0 );
     parcelPDF
     {
@@ -70,29 +86,10 @@ ConeInjectionCoeffs
     position        ( 0.25 0.25 0.05 );
     direction       ( 0 -1 0 );
     parcelsPerSecond 10000;
-    volumeFlowRate  Constant;
+    volumeFlowRate  Constant 0.01;
-    volumeFlowRateCoeffs
+    Umag            Constant 50;
-    {
+    thetaInner      Constant 0;
-        value           0.01;
+    thetaOuter      Constant 30;
-    }
-
-    Umag            Constant;
-    UmagCoeffs
-    {
-        value           50;
-    }
-
-    thetaInner      Constant;
-    thetaInnerCoeffs
-    {
-        value           0;
-    }
-
-    thetaOuter      Constant;
-    thetaOuterCoeffs
-    {
-        value           30;
-    }
 
     parcelPDF
     {

tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary

@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
+|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties

@@ -21,33 +21,37 @@ DragModel       SphereDrag;
 
 DispersionModel StochasticDispersionRAS;
 
-WallInteractionModel StandardWallInteraction;
+PatchInteractionModel StandardWallInteraction;
 
 HeatTransferModel RanzMarshall;
 
+PostProcessingModel none;
+
 radiation       off;
 
-minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
-
-rho0            rho0 [ 1 -3 0 0 0 ] 2500;
-
-T0              T0 [ 0 0 0 1 0 ] 300;
-
-cp0             cp0 [ 0 2 -2 -1 0 ] 900;
-
-epsilon0        epsilon0 [ 0 0 0 0 0 ] 1;
-
-f0              f0 [ 0 0 0 0 0 ] 0.5;
-
 coupled         true;
 
+cellValueSourceCorrection on;
+
 parcelTypeId    1;
 
+constantProperties
+{
+    rhoMin          rhoMin [ 1 -3 0 0 0 ] 1e-15;
+    TMin            TMin [ 0 0 0 1 0 ] 200;
+    minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
+    rho0            rho0 [ 1 -3 0 0 0 ] 2500;
+    T0              T0 [ 0 0 0 1 0 ] 300;
+    cp0             cp0 [ 0 2 -2 -1 0 ] 900;
+    epsilon0        epsilon0 [ 0 0 0 0 0 ] 1;
+    f0              f0 [ 0 0 0 0 0 ] 0.5;
+}
+
 interpolationSchemes
 {
     rho             cell;
-    U               cellPointFace;
     mu              cell;
+    U               cellPoint;
     T               cell;
     Cp              cell;
 }
@@ -58,12 +62,21 @@ integrationSchemes
     T               Analytical;
 }
 
+particleForces
+{
+    gravity         on;
+    virtualMass     off;
+    Cvm             0.5;
+    pressureGradient off;
+    gradU           gradU;
+}
+
 ManualInjectionCoeffs
 {
     massTotal       massTotal [ 1 0 0 0 0 ] 0.0001;
     parcelBasisType mass;
     SOI             0;
-    positionsFile   thermoCloud1Positions;
+    positionsFile   "thermoCloud1Positions";
     U0              ( 0 0 0 );
     parcelPDF
     {

tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties

@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
+|  \\    /   O peration     | Version:  1.5.x                                 |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,11 +10,12 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      spray;
+    location    "constant";
+    object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-(
+simulationType  RASModel;
-)
+
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "system";
     object      cellSetDict.1;
@@ -19,7 +19,13 @@ name            c0;
 
 action          new;
 
-topoSetSources  ( boxToCell { box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ; } );
+topoSetSources
+(
+    boxToCell
+    {
+        box (0.004 -0.001 -1) (0.012 0.001 1);
+    }
+);
 
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "system";
     object      cellSetDict.2;
@@ -19,7 +19,13 @@ name            c0;
 
 action          new;
 
-topoSetSources  ( boxToCell { box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ; } );
+topoSetSources
+(
+    boxToCell
+    {
+        box (0.0045 -0.00075 -1) (0.0095 0.00075 1);
+    }
+);
 
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "system";
     object      cellSetDict.3;
@@ -19,7 +19,13 @@ name            c0;
 
 action          new;
 
-topoSetSources  ( boxToCell { box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ; } );
+topoSetSources
+(
+    boxToCell
+    {
+        box (0.00475 -0.000375 -1) (0.009 0.000375 1);
+    }
+);
 
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "system";
     object      cellSetDict.1;
@@ -19,7 +19,13 @@ name            c0;
 
 action          new;
 
-topoSetSources  ( boxToCell { box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ; } );
+topoSetSources
+(
+    boxToCell
+    {
+        box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 );
+    }
+);
 
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "system";
     object      cellSetDict.2;
@@ -19,7 +19,13 @@ name            c0;
 
 action          new;
 
-topoSetSources  ( boxToCell { box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ; } );
+topoSetSources
+(
+    boxToCell
+    {
+        box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 );
+    }
+);
 
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "system";
     object      cellSetDict.3;
@@ -19,7 +19,13 @@ name            c0;
 
 action          new;
 
-topoSetSources  ( boxToCell { box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ; } );
+topoSetSources
+(
+    boxToCell
+    {
+        box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 );
+    }
+);
 
 
 // ************************************************************************* //

tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.org

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun

@@ -7,6 +7,6 @@ application="compressibleInterFoam"
 
 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
-cp 0/pd.org 0/pd
+cp 0/p.org 0/p
 runApplication setFields
 runApplication $application

tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes

@@ -30,7 +30,7 @@ divSchemes
     div(rho*phi,U)  Gauss upwind;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss interfaceCompression 1;
-    div(phi,pd)     Gauss upwind;
+    div(phi,p)      Gauss upwind;
     div(phi,k)      Gauss vanLeer;
     div((nuEff*dev(grad(U).T()))) Gauss linear;
 }
@@ -53,9 +53,9 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd              ;
+    p;
-    pcorr           ;
+    pcorr;
-    gamma           ;
+    gamma;
 }
 
 

tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution

@@ -45,7 +45,7 @@ solvers
         solver          diagonal;
     }
 
-    pd
+    p
     {
         solver          GAMG;
         tolerance       1e-07;
@@ -60,7 +60,7 @@ solvers
         mergeLevels     1;
     }
 
-    pdFinal
+    pFinal
     {
         solver          PCG;
         preconditioner

tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict

@@ -15,9 +15,33 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-defaultFieldValues ( volScalarFieldValue alpha1 1 volScalarFieldValue pd 100000 );
+defaultFieldValues
+(
+    volScalarFieldValue alpha1 1
+    volScalarFieldValue p 100000
+);
 
-regions         ( sphereToCell { centre ( 0.5 0.5 0 ) ; radius 0.1 ; fieldValues ( volScalarFieldValue alpha1 0 volScalarFieldValue pd 1000000 ) ; } boxToCell { box ( -10 1 -1 ) ( 10 10 1 ) ; fieldValues ( volScalarFieldValue alpha1 0 ) ; } );
+regions
+(
+    sphereToCell
+    {
+        centre ( 0.5 0.5 0 );
+        radius 0.1;
+        fieldValues
+        (
+            volScalarFieldValue alpha1 0
+            volScalarFieldValue p 1000000
+        );
+    }
+    boxToCell
+    {
+        box ( -10 1 -1 ) ( 10 10 1 );
+        fieldValues
+        (
+            volScalarFieldValue alpha1 0
+        );
+    }
+);
 
 
 // ************************************************************************* //

tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/p.org

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd.org;
+    object      p.org;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean

@@ -2,4 +2,4 @@
 
 foamCleanTutorials cases
 rm -rf processor*
-rm -rf 0/pd.gz 0/alpha1.gz
+rm -rf 0/p.gz 0/alpha1.gz

tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun

@@ -7,7 +7,7 @@ application="compressibleInterFoam"
 
 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
-cp 0/pd.org 0/pd
+cp 0/p.org 0/p
 runApplication setFields
 runApplication decomposePar
 hostname > system/machines

tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes

@@ -30,7 +30,7 @@ divSchemes
     div(rho*phi,U)  Gauss upwind;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss interfaceCompression 1;
-    div(phi,pd)     Gauss upwind;
+    div(phi,p)      Gauss upwind;
     div(phi,k)      Gauss vanLeer;
     div((nuEff*dev(grad(U).T()))) Gauss linear;
 }
@@ -53,9 +53,9 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd              ;
+    p;
-    pcorr           ;
+    pcorr;
-    gamma           ;
+    gamma;
 }
 
 

tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution

@@ -45,7 +45,7 @@ solvers
         solver          diagonal;
     }
 
-    pd
+    p
     {
         solver          GAMG;
         tolerance       1e-07;
@@ -60,7 +60,7 @@ solvers
         mergeLevels     1;
     }
 
-    pdFinal
+    pFinal
     {
         solver          PCG;
         preconditioner

tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict

@@ -15,9 +15,33 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-defaultFieldValues ( volScalarFieldValue alpha1 1 volScalarFieldValue pd 100000 );
+defaultFieldValues
+(
+    volScalarFieldValue alpha1 1
+    volScalarFieldValue p 100000
+);
 
-regions         ( sphereToCell { centre ( 0.5 0.5 0.5 ) ; radius 0.1 ; fieldValues ( volScalarFieldValue alpha1 0 volScalarFieldValue pd 1000000 ) ; } boxToCell { box ( -10 1 -1 ) ( 10 10 1 ) ; fieldValues ( volScalarFieldValue alpha1 0 ) ; } );
+regions
+(
+    sphereToCell
+    {
+        centre ( 0.5 0.5 0.5 );
+        radius 0.1;
+        fieldValues
+        (
+            volScalarFieldValue alpha1 0
+            volScalarFieldValue p 1000000
+        );
+    }
+    boxToCell
+    {
+        box ( -10 1 -1 ) ( 10 10 1 );
+        fieldValues
+        (
+            volScalarFieldValue alpha1 0
+        );
+    }
+);
 
 
 // ************************************************************************* //

tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes

@@ -52,9 +52,9 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd              ;
+    p;
-    pcorr           ;
+    pcorr;
-    alpha           ;
+    alpha;
 }
 
 

tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution

@@ -40,7 +40,7 @@ solvers
         maxIter         100;
     }
 
-    pd
+    p
     {
         solver          GAMG;
         tolerance       1e-08;
@@ -55,7 +55,7 @@ solvers
         mergeLevels     1;
     }
 
-    pdFinal
+    pFinal
     {
         solver          PCG;
         preconditioner
@@ -122,9 +122,8 @@ PISO
     nAlphaSubCycles 3;
     cAlpha          1;
 
-    pdRefPoint      (0.51 0.51 0.51);
+    pRefPoint      (0.51 0.51 0.51);
-    pdRefValue      0;
+    pRefValue      0;
-    pRefValue       0;
 }
 
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict

@@ -54,7 +54,7 @@ functions
     probes
     {
         type            probes;
-        name            probes;
+        functionObjectLibs ( "libsampling.so" );
         outputControl   timeStep;
         outputInterval  1;
         probeLocations

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes

@@ -52,9 +52,9 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd              ;
+    p;
-    pcorr           ;
+    pcorr;
-    alpha           ;
+    alpha;
 }
 
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution

@@ -40,7 +40,7 @@ solvers
         maxIter         100;
     }
 
-    pd
+    p
     {
         solver          GAMG;
         tolerance       1e-08;
@@ -55,7 +55,7 @@ solvers
         mergeLevels     1;
     }
 
-    pdFinal
+    pFinal
     {
         solver          PCG;
         preconditioner
@@ -99,8 +99,7 @@ PISO
     cAlpha          1.5;
     correctPhi      no;
 
-    pdRefPoint      (0 0 0.15);
+    pRefPoint       (0 0 0.15);
-    pdRefValue      0;
     pRefValue       1e5;
 }
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict

@@ -25,7 +25,10 @@ regions
     boxToCell
     {
         box ( -100 -100 -100 ) ( 100 100 0 );
-        fieldValues ( volScalarFieldValue alpha1 1 );
+        fieldValues
+        (
+            volScalarFieldValue alpha1 1
+        );
     }
 );
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes

@@ -52,9 +52,9 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd              ;
+    p;
-    pcorr           ;
+    pcorr;
-    alpha           ;
+    alpha;
 }
 
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution

@@ -40,7 +40,7 @@ solvers
         maxIter         100;
     }
 
-    pd
+    p
     {
         solver          GAMG;
         tolerance       1e-08;
@@ -55,7 +55,7 @@ solvers
         mergeLevels     1;
     }
 
-    pdFinal
+    pFinal
     {
         solver          PCG;
         preconditioner
@@ -99,8 +99,7 @@ PISO
     cAlpha          1.5;
     correctPhi      no;
 
-    pdRefPoint      (0 0 0.15);
+    pRefPoint       (0 0 0.15);
-    pdRefValue      0;
     pRefValue       1e5;
 }
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict

@@ -25,7 +25,10 @@ regions
     boxToCell
     {
         box ( -100 -100 -100 ) ( 100 100 0 );
-        fieldValues ( volScalarFieldValue alpha1 1 );
+        fieldValues
+        (
+            volScalarFieldValue alpha1 1
+        );
     }
 );
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes

@@ -52,9 +52,9 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd              ;
+    p;
-    pcorr           ;
+    pcorr;
-    alpha           ;
+    alpha;
 }
 
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution

@@ -40,7 +40,7 @@ solvers
         maxIter         100;
     }
 
-    pd
+    p
     {
         solver          GAMG;
         tolerance       1e-08;
@@ -55,7 +55,7 @@ solvers
         mergeLevels     1;
     }
 
-    pdFinal
+    pFinal
     {
         solver          PCG;
         preconditioner
@@ -99,8 +99,7 @@ PISO
     cAlpha          1.5;
     correctPhi      no;
 
-    pdRefPoint      (0 0 0.15);
+    pRefPoint       (0 0 0.15);
-    pdRefValue      0;
     pRefValue       1e5;
 }
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict

@@ -25,7 +25,10 @@ regions
     boxToCell
     {
         box ( -100 -100 -100 ) ( 100 100 0 );
-        fieldValues ( volScalarFieldValue alpha1 1 );
+        fieldValues
+        (
+            volScalarFieldValue alpha1 1
+        );
     }
 );
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes

@@ -52,9 +52,9 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd              ;
+    p;
-    pcorr           ;
+    pcorr;
-    alpha           ;
+    alpha;
 }
 
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution

@@ -40,7 +40,7 @@ solvers
         maxIter         100;
     }
 
-    pd
+    p
     {
         solver          GAMG;
         tolerance       1e-08;
@@ -55,7 +55,7 @@ solvers
         mergeLevels     1;
     }
 
-    pdFinal
+    pFinal
     {
         solver          PCG;
         preconditioner
@@ -99,8 +99,7 @@ PISO
     cAlpha          1.5;
     correctPhi      no;
 
-    pdRefPoint      (0 0 0.15);
+    pRefPoint       (0 0 0.15);
-    pdRefValue      0;
     pRefValue       1e5;
 }
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict

@@ -25,7 +25,10 @@ regions
     boxToCell
     {
         box ( -100 -100 -100 ) ( 100 100 0 );
-        fieldValues ( volScalarFieldValue alpha1 1 );
+        fieldValues
+        (
+            volScalarFieldValue alpha1 1
+        );
     }
 );
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes

@@ -52,9 +52,9 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd              ;
+    p;
-    pcorr           ;
+    pcorr;
-    alpha           ;
+    alpha;
 }
 
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution

@@ -40,7 +40,7 @@ solvers
         maxIter         100;
     }
 
-    pd
+    p
     {
         solver          GAMG;
         tolerance       1e-08;
@@ -55,7 +55,7 @@ solvers
         mergeLevels     1;
     }
 
-    pdFinal
+    pFinal
     {
         solver          PCG;
         preconditioner
@@ -99,8 +99,7 @@ PISO
     cAlpha          1.5;
     correctPhi      no;
 
-    pdRefPoint      (0 0 0.15);
+    pRefPoint       (0 0 0.15);
-    pdRefValue      0;
     pRefValue       1e5;
 }
 

tutorials/multiphase/interFoam/laminar/damBreak/0/p

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes

@@ -52,9 +52,9 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd              ;
+    p;
-    pcorr           ;
+    pcorr;
-    alpha1          ;
+    alpha1;
 }
 
 

tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution

@@ -25,7 +25,7 @@ solvers
         relTol          0;
     }
 
-    pd
+    p
     {
         solver          PCG;
         preconditioner  DIC;
@@ -33,7 +33,7 @@ solvers
         relTol          0.05;
     }
 
-    pdFinal
+    pFinal
     {
         solver          PCG;
         preconditioner  DIC;

tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes

@@ -56,9 +56,9 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd              ;
+    p;
-    pcorr           ;
+    pcorr;
-    alpha1          ;
+    alpha;
 }
 
 

tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution

@@ -40,7 +40,7 @@ solvers
         maxIter         100;
     }
 
-    pd
+    p
     {
         solver          GAMG;
         tolerance       1e-07;
@@ -55,7 +55,7 @@ solvers
         mergeLevels     1;
     }
 
-    pdFinal
+    pFinal
     {
         solver          PCG;
         preconditioner

tutorials/multiphase/interFoam/ras/Allrun

@@ -32,7 +32,7 @@ cloneCase damBreak damBreakFine
 cd damBreakFine
     # Modify case
     setDamBreakFine
-    cp ../damBreak/0/gamma.org 0/gamma
+    cp ../damBreak/0/alpha1.org 0/alpha1
     # And execute
     runApplication blockMesh
     runApplication setFields

tutorials/multiphase/interFoam/ras/damBreak/0/U

@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
+|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
+    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -38,7 +39,6 @@ boundaryField
     atmosphere
     {
         type            pressureInletOutletVelocity;
-        phi             phi;
         value           uniform (0 0 0);
     }
     defaultFaces
@@ -47,4 +47,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/multiphase/interFoam/ras/damBreak/0/alpha1

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      gamma;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      gamma;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/interFoam/ras/damBreak/0/epsilon

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 0.1;
 
@@ -24,28 +24,24 @@ boundaryField
     leftWall
     {
         type            epsilonWallFunction;
-        value           uniform 0;
+        value           uniform 0.1;
     }
-
     rightWall
     {
         type            epsilonWallFunction;
-        value           uniform 0;
+        value           uniform 0.1;
     }
-
     lowerWall
     {
         type            epsilonWallFunction;
-        value           uniform 0;
+        value           uniform 0.1;
     }
-
     atmosphere
     {
         type            inletOutlet;
         inletValue      uniform 0.1;
         value           uniform 0.1;
     }
-
     defaultFaces
     {
         type            empty;

tutorials/multiphase/interFoam/ras/damBreak/0/k

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.1;
 
@@ -24,28 +24,24 @@ boundaryField
     leftWall
     {
         type            kQRWallFunction;
-        value           uniform 0;
+        value           uniform 0.1;
     }
-
     rightWall
     {
         type            kQRWallFunction;
-        value           uniform 0;
+        value           uniform 0.1;
     }
-
     lowerWall
     {
         type            kQRWallFunction;
-        value           uniform 0;
+        value           uniform 0.1;
     }
-
     atmosphere
     {
         type            inletOutlet;
         inletValue      uniform 0.1;
         value           uniform 0.1;
     }
-
     defaultFaces
     {
         type            empty;

tutorials/multiphase/interFoam/ras/damBreak/0/p

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes

@@ -28,8 +28,8 @@ gradSchemes
 divSchemes
 {
     div(rho*phi,U)  Gauss linear;
-    div(phi,gamma)  Gauss vanLeer;
+    div(phi,alpha)  Gauss vanLeer;
-    div(phirb,gamma) Gauss interfaceCompression;
+    div(phirb,alpha) Gauss interfaceCompression;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,R)      Gauss upwind;
@@ -57,9 +57,9 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    pd              ;
+    p;
-    pcorr           ;
+    pcorr;
-    gamma           ;
+    alpha;
 }
 
 

tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution

@@ -25,7 +25,7 @@ solvers
         relTol          0;
     }
 
-    pd
+    p
     {
         solver          PCG;
         preconditioner  DIC;
@@ -33,7 +33,7 @@ solvers
         relTol          0.05;
     }
 
-    pdFinal
+    pFinal
     {
         solver          PCG;
         preconditioner  DIC;
@@ -87,9 +87,9 @@ PISO
     momentumPredictor no;
     nCorrectors     3;
     nNonOrthogonalCorrectors 0;
-    nGammaCorr      1;
+    nAlphaCorr      1;
-    nGammaSubCycles 4;
+    nAlphaSubCycles 4;
-    cGamma          2;
+    cAlpha          2;
 }
 
 

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution

@@ -40,7 +40,7 @@ solvers
         maxIter         100;
     }
 
-    pd
+    p
     {
         solver          GAMG;
         tolerance       1e-07;
@@ -55,7 +55,7 @@ solvers
         mergeLevels     1;
     }
 
-    pdFinal
+    pFinal
     {
         solver          PCG;
         preconditioner

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      pd;
+    object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution

@@ -40,7 +40,7 @@ solvers
         maxIter         100;
     }
 
-    pd
+    p
     {
         solver          GAMG;
         tolerance       1e-07;
@@ -55,7 +55,7 @@ solvers
         mergeLevels     1;
     }
 
-    pdFinal
+    pFinal
     {
         solver          PCG;
         preconditioner