GIT: Initial state after latest Foundation merge

.gitignore

@@ -6,8 +6,6 @@
 .*~
 *.bak
 *.bak[0-9][0-9]
-*.orig
-*.orig[0-9][0-9]
 \#*\#
 
 # File-browser settings - anywhere

Allwmake

@@ -1,9 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Parse arguments for library compilation without documentation by default
+# Parse arguments for library compilation
-genDoc=0
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 wmakeCheckPwd "$WM_PROJECT_DIR" || {
@@ -36,11 +34,5 @@ src/Allwmake $targetType $*
 # Compile OpenFOAM libraries and applications
 applications/Allwmake $targetType $*
 
-# Optionally build OpenFOAM Doxygen documentation
-if [ $genDoc -eq 1 ]
-then
-    doc/Allwmake
-fi
-
 
 #------------------------------------------------------------------------------

applications/Allwmake

@@ -2,7 +2,6 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 wmakeCheckPwd "$WM_PROJECT_DIR/applications" || {
@@ -20,8 +19,8 @@ wmakeCheckPwd "$WM_PROJECT_DIR/applications" || {
 
 set -x
 
-wmake -all solvers $*
+wmake -all $targetType solvers
-wmake -all utilities $*
+wmake -all $targetType utilities
 
 
 #------------------------------------------------------------------------------

applications/solvers/DNS/dnsFoam/createFields.H

@@ -1,3 +1,5 @@
+#include "readTransportProperties.H"
+
 Info<< "Reading field p\n" << endl;
 volScalarField p
 (
@@ -29,3 +31,5 @@ volVectorField U
 #include "createPhi.H"
 
 mesh.setFluxRequired(p.name());
+
+#include "readTurbulenceProperties.H"

applications/solvers/DNS/dnsFoam/dnsFoam.C

@@ -28,7 +28,7 @@ Group
     grpDNSSolvers
 
 Description
-    Direct numerical simulation solver for boxes of isotropic turbulence
+    Direct numerical simulation solver for boxes of isotropic turbulence.
 
 \*---------------------------------------------------------------------------*/
 
@@ -44,16 +44,13 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createTime.H"
     #include "createMeshNoClear.H"
-
+    #include "createControl.H"
-    pisoControl piso(mesh);
-
-    #include "readTransportProperties.H"
     #include "createFields.H"
-    #include "readTurbulenceProperties.H"
     #include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -64,7 +61,7 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        force.internalField() = ReImSum
+        force.primitiveFieldRef() = ReImSum
         (
             fft::reverseTransform
             (
@@ -119,7 +116,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        if (runTime.outputTime())
+        if (runTime.writeTime())
         {
             calcEk(U, K).write
             (

applications/solvers/basic/laplacianFoam/laplacianFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,6 +52,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
+#include "fvOptions.H"
 #include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -66,6 +67,7 @@ int main(int argc, char *argv[])
     simpleControl simple(mesh);
 
     #include "createFields.H"
+    #include "createFvOptions.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -77,10 +79,16 @@ int main(int argc, char *argv[])
 
         while (simple.correctNonOrthogonal())
         {
-            solve
+            fvScalarMatrix TEqn
             (
                 fvm::ddt(T) - fvm::laplacian(DT, T)
+             ==
+                fvOptions(T)
             );
+
+            fvOptions.constrain(TEqn);
+            TEqn.solve();
+            fvOptions.correct(T);
         }
 
         #include "write.H"

applications/solvers/basic/laplacianFoam/write.H

@@ -1,4 +1,4 @@
-    if (runTime.outputTime())
+    if (runTime.writeTime())
     {
         volVectorField gradT(fvc::grad(T));
 

applications/solvers/basic/potentialFoam/createFields.H

@@ -43,7 +43,7 @@ word pName("p");
 // Update name of the pressure field from the command-line option
 args.optionReadIfPresent("pName", pName);
 
-// Infer the pressure BCs from the velocity BCs
+// Infer the pressure BCs from the velocity
 wordList pBCTypes
 (
     U.boundaryField().size(),
@@ -78,62 +78,36 @@ volScalarField p
     pBCTypes
 );
 
-label pRefCell = 0;
+// Infer the velocity potential BCs from the pressure
-scalar pRefValue = 0.0;
+wordList PhiBCTypes
-if (args.optionFound("writep"))
-{
-    setRefCell
-    (
-        p,
-        potentialFlow.dict(),
-        pRefCell,
-        pRefValue
-    );
-}
-
-
-Info<< "Constructing velocity potential field Phi\n" << endl;
-autoPtr<volScalarField> PhiPtr;
-
-IOobject io
 (
-    "Phi",
+    p.boundaryField().size(),
-    runTime.timeName(),
+    zeroGradientFvPatchScalarField::typeName
-    mesh,
-    IOobject::MUST_READ,
-    IOobject::NO_WRITE
 );
 
-if (io.typeHeaderOk<volScalarField>())
+forAll(p.boundaryField(), patchi)
 {
-    PhiPtr.reset(new volScalarField(io, mesh));
+    if (p.boundaryField()[patchi].fixesValue())
-}
-else
-{
-    // Cannot just use p.boundaryField().types() since does not initialise
-    // complex boundary types. Instead re-clone them from p.
-
-    io.readOpt() = IOobject::NO_READ;
-    PhiPtr.reset
-    (
-        new volScalarField
-        (
-            io,
-            mesh,
-            dimensionedScalar("Phi", dimLength*dimVelocity, 0),
-            p.boundaryField().types()
-        )
-    );
-
-    const volScalarField::GeometricBoundaryField& bp = p.boundaryField();
-    volScalarField::GeometricBoundaryField& bPhi = PhiPtr().boundaryField();
-
-    forAll(bp, patchI)
     {
-        bPhi.set(patchI, bp[patchI].clone(PhiPtr().dimensionedInternalField()));
+        PhiBCTypes[patchi] = fixedValueFvPatchScalarField::typeName;
     }
 }
-volScalarField& Phi = PhiPtr();
+
+Info<< "Constructing velocity potential field Phi\n" << endl;
+volScalarField Phi
+(
+    IOobject
+    (
+        "Phi",
+        runTime.timeName(),
+        mesh,
+        IOobject::READ_IF_PRESENT,
+        IOobject::NO_WRITE
+    ),
+    mesh,
+    dimensionedScalar("Phi", dimLength*dimVelocity, 0),
+    PhiBCTypes
+);
 
 label PhiRefCell = 0;
 scalar PhiRefValue = 0;

applications/solvers/basic/potentialFoam/potentialFoam.C

@@ -28,7 +28,9 @@ Group
     grpBasicSolvers
 
 Description
-    Potential flow solver.
+    Potential flow solver which solves for the velocity potential
+    from which the flux-field is obtained and velocity field by reconstructing
+    the flux.
 
     \heading Solver details
     The potential flow solution is typically employed to generate initial fields

applications/solvers/combustion/PDRFoam/PDRFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,17 +87,16 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "readCombustionProperties.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"
@@ -113,7 +112,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "createTimeControls.H"
+        #include "readTimeControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
 

applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "createTimeControls.H"
+        #include "readTimeControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
 
@@ -131,11 +131,11 @@ int main(int argc, char *argv[])
                 protectedCell = 0;
             }
 
-            forAll(betav, cellI)
+            forAll(betav, celli)
             {
-                if (betav[cellI] < 0.99)
+                if (betav[celli] < 0.99)
                 {
-                    protectedCell[cellI] = 1;
+                    protectedCell[celli] = 1;
                 }
             }
 

applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C

@@ -105,7 +105,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::basicSubGrid::XiEq() const
         mesh,
         dimensionedScalar("zero", Nv.dimensions(), 0.0)
     );
-    N.internalField() = Nv.internalField()*Cw;
+    N.primitiveFieldRef() = Nv.primitiveField()*Cw;
 
     volSymmTensorField ns
     (
@@ -125,7 +125,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::basicSubGrid::XiEq() const
             Zero
         )
     );
-    ns.internalField() = nsv.internalField()*Cw;
+    ns.primitiveFieldRef() = nsv.primitiveField()*Cw;
 
     volScalarField n(max(N - (Uhat & ns & Uhat), scalar(1e-4)));
     volScalarField b((Uhat & B_ & Uhat)/sqrt(n));

applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C

@@ -73,7 +73,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiGModels::basicSubGrid::G() const
     volScalarField& Gtot = tGtot.ref();
 
     const scalarField Cw = pow(Su_.mesh().V(), 2.0/3.0);
-    scalarField N(Nv.internalField()*Cw);
+    scalarField N(Nv.primitiveField()*Cw);
 
     forAll(N, celli)
     {

applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C

@@ -130,7 +130,7 @@ void PDRkEpsilon::correct()
     tgradU.clear();
 
     // Update espsilon and G at the wall
-    epsilon_.boundaryField().updateCoeffs();
+    epsilon_.boundaryFieldRef().updateCoeffs();
 
     // Add the blockage generation term so that it is included consistently
     // in both the k and epsilon equations
@@ -163,7 +163,7 @@ void PDRkEpsilon::correct()
 
     epsEqn.ref().relax();
 
-    epsEqn.ref().boundaryManipulate(epsilon_.boundaryField());
+    epsEqn.ref().boundaryManipulate(epsilon_.boundaryFieldRef());
 
     solve(epsEqn);
     bound(epsilon_, epsilonMin_);

applications/solvers/combustion/PDRFoam/StCourantNo.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,8 +36,8 @@ Description
     {
        scalarField sumPhi
         (
-            fvc::surfaceSum(mag(phiSt))().internalField()
+            fvc::surfaceSum(mag(phiSt))().primitiveField()
-          / rho.internalField()
+          / rho.primitiveField()
         );
 
         StCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue();

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::Gulder::XiEq() const
 
     if (subGridSchelkin_)
     {
-        up.internalField() += calculateSchelkinEffect(uPrimeCoef_);
+        up.primitiveFieldRef() += calculateSchelkinEffect(uPrimeCoef_);
     }
 
     volScalarField tauEta(sqrt(mag(thermo_.muu()/(thermo_.rhou()*epsilon))));

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C

@@ -82,7 +82,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::SCOPEXiEq::XiEq() const
     volScalarField up(sqrt((2.0/3.0)*k));
     if (subGridSchelkin_)
     {
-        up.internalField() += calculateSchelkinEffect(uPrimeCoef_);
+        up.primitiveFieldRef() += calculateSchelkinEffect(uPrimeCoef_);
     }
 
     volScalarField l(lCoef_*sqrt(3.0/2.0)*up*k/epsilon);
@@ -119,9 +119,11 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::SCOPEXiEq::XiEq() const
         }
     }
 
+    volScalarField::Boundary& xieqBf = xieq.boundaryFieldRef();
+
     forAll(xieq.boundaryField(), patchi)
     {
-        scalarField& xieqp = xieq.boundaryField()[patchi];
+        scalarField& xieqp = xieqBf[patchi];
         const scalarField& Kp = K.boundaryField()[patchi];
         const scalarField& Map = Ma.boundaryField()[patchi];
         const scalarField& upBySup = upBySu.boundaryField()[patchi];

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C

@@ -114,7 +114,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const
         )
     );
     volScalarField& N = tN.ref();
-    N.internalField() = Nv.internalField()*pow(mesh.V(), 2.0/3.0);
+    N.primitiveFieldRef() = Nv.primitiveField()*pow(mesh.V(), 2.0/3.0);
 
     volSymmTensorField ns
     (
@@ -134,7 +134,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const
             Zero
         )
     );
-    ns.internalField() = nsv.internalField()*pow(mesh.V(), 2.0/3.0);
+    ns.primitiveFieldRef() = nsv.primitiveField()*pow(mesh.V(), 2.0/3.0);
 
     const volVectorField Uhat
     (
@@ -150,7 +150,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const
     const scalarField deltaUp(upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0));
 
     // Re use tN
-    N.internalField() = upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0);
+    N.primitiveFieldRef() = upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0);
 
     return tN;
 }

applications/solvers/combustion/PDRFoam/createFieldRefs.H

@@ -0,0 +1 @@
+const volScalarField& psi = thermo.psi();

applications/solvers/combustion/PDRFoam/createFields.H

@@ -23,7 +23,6 @@ volScalarField rho
 );
 
 volScalarField& p = thermo.p();
-const volScalarField& psi = thermo.psi();
 
 volScalarField& b = composition.Y("b");
 Info<< "min(b) = " << min(b).value() << endl;
@@ -227,3 +226,5 @@ fields.add(b);
 fields.add(thermo.he());
 fields.add(thermo.heu());
 flameWrinkling->addXi(fields);
+
+#include "createMRF.H"

applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C

@@ -266,9 +266,11 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Su0pTphi
         Su0[celli] = Su0pTphi(p[celli], Tu[celli], phi);
     }
 
-    forAll(Su0.boundaryField(), patchi)
+    volScalarField::Boundary& Su0Bf = Su0.boundaryFieldRef();
+
+    forAll(Su0Bf, patchi)
     {
-        scalarField& Su0p = Su0.boundaryField()[patchi];
+        scalarField& Su0p = Su0Bf[patchi];
         const scalarField& pp = p.boundaryField()[patchi];
         const scalarField& Tup = Tu.boundaryField()[patchi];
 
@@ -313,9 +315,11 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Su0pTphi
         Su0[celli] = Su0pTphi(p[celli], Tu[celli], phi[celli]);
     }
 
-    forAll(Su0.boundaryField(), patchi)
+    volScalarField::Boundary& Su0Bf = Su0.boundaryFieldRef();
+
+    forAll(Su0Bf, patchi)
     {
-        scalarField& Su0p = Su0.boundaryField()[patchi];
+        scalarField& Su0p = Su0Bf[patchi];
         const scalarField& pp = p.boundaryField()[patchi];
         const scalarField& Tup = Tu.boundaryField()[patchi];
         const scalarField& phip = phi.boundaryField()[patchi];
@@ -365,9 +369,11 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Ma
         ma[celli] = Ma(phi[celli]);
     }
 
-    forAll(ma.boundaryField(), patchi)
+    volScalarField::Boundary& maBf = ma.boundaryFieldRef();
+
+    forAll(maBf, patchi)
     {
-        scalarField& map = ma.boundaryField()[patchi];
+        scalarField& map = maBf[patchi];
         const scalarField& phip = phi.boundaryField()[patchi];
 
         forAll(map, facei)

applications/solvers/combustion/XiFoam/XiFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,16 +65,15 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "readCombustionProperties.H"
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"
@@ -89,7 +88,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "createTimeControls.H"
+        #include "readTimeControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
 

applications/solvers/combustion/XiFoam/createFieldRefs.H

@@ -0,0 +1 @@
+const volScalarField& psi = thermo.psi();

applications/solvers/combustion/XiFoam/createFields.H

@@ -23,7 +23,6 @@ volScalarField rho
 );
 
 volScalarField& p = thermo.p();
-const volScalarField& psi = thermo.psi();
 
 volScalarField& b = composition.Y("b");
 Info<< "min(b) = " << min(b).value() << endl;
@@ -139,3 +138,5 @@ if (composition.contains("ft"))
 fields.add(b);
 fields.add(thermo.he());
 fields.add(thermo.heu());
+
+#include "createMRF.H"

applications/solvers/combustion/chemFoam/chemFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,12 +28,10 @@ Group
     grpCombustionSolvers
 
 Description
-    Solver for chemistry problems designed for use on single cell cases to
+    Solver for chemistry problems, designed for use on single cell cases to
-    provide comparison against other chemistry solvers
+    provide comparison against other chemistry solvers, that uses a single cell
+    mesh, and fields created from the initial conditions.
 
-    Note:
-    - single cell mesh created on-the-fly
-    - fields created on the fly from the initial conditions
 
 \*---------------------------------------------------------------------------*/
 
@@ -52,10 +50,15 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
 
+    #define CREATE_MESH createSingleCellMesh.H
+    #define NO_CONTROL
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createSingleCellMesh.H"
     #include "createFields.H"
+    #include "createFieldRefs.H"
     #include "readInitialConditions.H"
     #include "createControls.H"
 

applications/solvers/combustion/chemFoam/createFieldRefs.H

@@ -0,0 +1,4 @@
+scalar dtChem = refCast<const psiChemistryModel>(chemistry).deltaTChem()[0];
+basicMultiComponentMixture& composition = thermo.composition();
+PtrList<volScalarField>& Y = composition.Y();
+volScalarField& p = thermo.p();

applications/solvers/combustion/chemFoam/createFields.H

@@ -27,14 +27,10 @@
     autoPtr<psiChemistryModel> pChemistry(psiChemistryModel::New(mesh));
 
     psiChemistryModel& chemistry = pChemistry();
-    scalar dtChem = refCast<const psiChemistryModel>(chemistry).deltaTChem()[0];
 
     psiReactionThermo& thermo = chemistry.thermo();
     thermo.validate(args.executable(), "h");
 
-    basicMultiComponentMixture& composition = thermo.composition();
-    PtrList<volScalarField>& Y = composition.Y();
-
     volScalarField rho
     (
         IOobject
@@ -48,8 +44,6 @@
         thermo.rho()
     );
 
-    volScalarField& p = thermo.p();
-
     volScalarField Rspecific
     (
         IOobject

applications/solvers/combustion/coldEngineFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I../engineFoam \
     -I../XiFoam \
     -I../../compressible/rhoPimpleFoam \

applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,15 +45,16 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #define CREATE_TIME createEngineTime.H
+    #define CREATE_MESH createEngineMesh.H
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createEngineTime.H"
     #include "createEngineMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
     #include "createRhoUf.H"
     #include "initContinuityErrs.H"

applications/solvers/combustion/coldEngineFoam/createFieldRefs.H

@@ -0,0 +1,2 @@
+const volScalarField& psi = thermo.psi();
+const volScalarField& T = thermo.T();

applications/solvers/combustion/coldEngineFoam/createFields.H

@@ -1,71 +1,70 @@
-    Info<< "Reading thermophysical properties\n" << endl;
+Info<< "Reading thermophysical properties\n" << endl;
 
-    autoPtr<psiThermo> pThermo
+autoPtr<psiThermo> pThermo
+(
+    psiThermo::New(mesh)
+);
+psiThermo& thermo = pThermo();
+thermo.validate(args.executable(), "h", "e");
+
+volScalarField rho
+(
+    IOobject
     (
-        psiThermo::New(mesh)
+        "rho",
-    );
+        runTime.timeName(),
-    psiThermo& thermo = pThermo();
-    thermo.validate(args.executable(), "h", "e");
-
-    volScalarField rho
-    (
-        IOobject
-        (
-            "rho",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        thermo.rho()
-    );
-
-    volScalarField& p = thermo.p();
-    const volScalarField& psi = thermo.psi();
-    const volScalarField& T = thermo.T();
-
-
-    Info<< "\nReading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    #include "compressibleCreatePhi.H"
-
-
-    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::turbulenceModel> turbulence
-    (
-        compressible::turbulenceModel::New
-        (
-            rho,
-            U,
-            phi,
-            thermo
-        )
-    );
-
-    Info<< "Creating field dpdt\n" << endl;
-    volScalarField dpdt
-    (
-        IOobject
-        (
-            "dpdt",
-            runTime.timeName(),
-            mesh
-        ),
         mesh,
-        dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+        IOobject::NO_READ,
-    );
+        IOobject::AUTO_WRITE
+    ),
+    thermo.rho()
+);
 
-    Info<< "Creating field kinetic energy K\n" << endl;
+volScalarField& p = thermo.p();
-    volScalarField K("K", 0.5*magSqr(U));
+
+Info<< "\nReading field U\n" << endl;
+volVectorField U
+(
+    IOobject
+    (
+        "U",
+        runTime.timeName(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::AUTO_WRITE
+    ),
+    mesh
+);
+
+#include "compressibleCreatePhi.H"
+
+
+Info<< "Creating turbulence model\n" << endl;
+autoPtr<compressible::turbulenceModel> turbulence
+(
+    compressible::turbulenceModel::New
+    (
+        rho,
+        U,
+        phi,
+        thermo
+    )
+);
+
+Info<< "Creating field dpdt\n" << endl;
+volScalarField dpdt
+(
+    IOobject
+    (
+        "dpdt",
+        runTime.timeName(),
+        mesh
+    ),
+    mesh,
+    dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+);
+
+Info<< "Creating field kinetic energy K\n" << endl;
+volScalarField K("K", 0.5*magSqr(U));
+
+#include "createMRF.H"

applications/solvers/combustion/engineFoam/engineFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,16 +68,17 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #define CREATE_TIME createEngineTime.H
+    #define CREATE_MESH createEngineMesh.H
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createEngineTime.H"
     #include "createEngineMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "readCombustionProperties.H"
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
     #include "createRhoUf.H"
     #include "initContinuityErrs.H"

applications/solvers/combustion/fireFoam/Make/options

@@ -21,7 +21,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/combustionModels/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/regionModels/pyrolysisModels/lnInclude \
@@ -29,7 +28,6 @@ EXE_INC = \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude
 
-
 EXE_LIBS = \
     -lfiniteVolume \
     -lfvOptions \

applications/solvers/combustion/fireFoam/YEEqn.H

@@ -12,12 +12,11 @@ tmp<fv::convectionScheme<scalar>> mvConvection
     radiation->correct();
     combustion->correct();
     dQ = combustion->dQ();
-    label inertIndex = -1;
     volScalarField Yt(0.0*Y[0]);
 
     forAll(Y, i)
     {
-        if (Y[i].name() != inertSpecie)
+        if (i != inertIndex && composition.active(i))
         {
             volScalarField& Yi = Y[i];
 
@@ -44,10 +43,6 @@ tmp<fv::convectionScheme<scalar>> mvConvection
             Yi.max(0.0);
             Yt += Yi;
         }
-        else
-        {
-            inertIndex = i;
-        }
     }
 
     Y[inertIndex] = scalar(1) - Yt;

applications/solvers/combustion/fireFoam/createFieldRefs.H

@@ -0,0 +1,4 @@
+const volScalarField& psi = thermo.psi();
+const volScalarField& T = thermo.T();
+filmModelType& surfaceFilm = tsurfaceFilm();
+const label inertIndex(composition.species()[inertSpecie]);

applications/solvers/combustion/fireFoam/createFields.H

@@ -19,6 +19,13 @@ basicMultiComponentMixture& composition = thermo.composition();
 PtrList<volScalarField>& Y = composition.Y();
 
 const word inertSpecie(thermo.lookup("inertSpecie"));
+if (!composition.species().found(inertSpecie))
+{
+    FatalIOErrorIn(args.executable().c_str(), thermo)
+        << "Inert specie " << inertSpecie << " not found in available species "
+        << composition.species()
+        << exit(FatalIOError);
+}
 
 Info<< "Creating field rho\n" << endl;
 volScalarField rho
@@ -35,8 +42,6 @@ volScalarField rho
 );
 
 volScalarField& p = thermo.p();
-const volScalarField& T = thermo.T();
-const volScalarField& psi = thermo.psi();
 
 Info<< "\nReading field U\n" << endl;
 volVectorField U
@@ -54,6 +59,9 @@ volVectorField U
 
 #include "compressibleCreatePhi.H"
 
+#include "createMRF.H"
+
+
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::turbulenceModel> turbulence
 (
@@ -69,6 +77,60 @@ autoPtr<compressible::turbulenceModel> turbulence
 // Set the turbulence into the combustion model
 combustion->setTurbulence(turbulence());
 
+
+#include "readGravitationalAcceleration.H"
+#include "readhRef.H"
+#include "gh.H"
+#include "readpRef.H"
+
+volScalarField p_rgh
+(
+    IOobject
+    (
+        "p_rgh",
+        runTime.timeName(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::AUTO_WRITE
+    ),
+    mesh
+);
+
+mesh.setFluxRequired(p_rgh.name());
+
+#include "phrghEqn.H"
+
+
+multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
+
+forAll(Y, i)
+{
+    fields.add(Y[i]);
+}
+fields.add(thermo.he());
+
+IOdictionary additionalControlsDict
+(
+    IOobject
+    (
+        "additionalControls",
+        runTime.constant(),
+        mesh,
+        IOobject::MUST_READ_IF_MODIFIED,
+        IOobject::NO_WRITE
+    )
+);
+
+Switch solvePrimaryRegion
+(
+    additionalControlsDict.lookup("solvePrimaryRegion")
+);
+
+Switch solvePyrolysisRegion
+(
+    additionalControlsDict.lookupOrDefault<bool>("solvePyrolysisRegion", true)
+);
+
 volScalarField dQ
 (
     IOobject
@@ -100,51 +162,7 @@ volScalarField dpdt
 Info<< "Creating field kinetic energy K\n" << endl;
 volScalarField K("K", 0.5*magSqr(U));
 
-
+#include "createClouds.H"
-#include "readGravitationalAcceleration.H"
+#include "createSurfaceFilmModel.H"
-#include "readhRef.H"
+#include "createPyrolysisModel.H"
-#include "gh.H"
+#include "createRadiationModel.H"
-
-
-volScalarField p_rgh
-(
-    IOobject
-    (
-        "p_rgh",
-        runTime.timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-// Force p_rgh to be consistent with p
-p_rgh = p - rho*gh;
-
-mesh.setFluxRequired(p_rgh.name());
-
-multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
-
-forAll(Y, i)
-{
-    fields.add(Y[i]);
-}
-fields.add(thermo.he());
-
-IOdictionary additionalControlsDict
-(
-    IOobject
-    (
-        "additionalControls",
-        runTime.constant(),
-        mesh,
-        IOobject::MUST_READ_IF_MODIFIED,
-        IOobject::NO_WRITE
-    )
-);
-
-Switch solvePrimaryRegion
-(
-    additionalControlsDict.lookup("solvePrimaryRegion")
-);

applications/solvers/combustion/fireFoam/createSurfaceFilmModel.H

@@ -3,4 +3,3 @@ Info<< "\nConstructing surface film model" << endl;
 typedef regionModels::surfaceFilmModels::surfaceFilmModel filmModelType;
 
 autoPtr<filmModelType> tsurfaceFilm(filmModelType::New(mesh, g));
-filmModelType& surfaceFilm = tsurfaceFilm();

applications/solvers/combustion/fireFoam/fireFoam.C

@@ -28,8 +28,8 @@ Group
     grpCombustionSolvers
 
 Description
-    Transient PIMPLE solver for fires and turbulent diffusion flames with
+    Transient solver for fires and turbulent diffusion flames with reacting
-    reacting Lagrangian parcels, surface film and pyrolysis modelling.
+    particle clouds, surface film and pyrolysis modelling.
 
 \*---------------------------------------------------------------------------*/
 
@@ -49,20 +49,15 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
-    #include "createClouds.H"
-    #include "createSurfaceFilmModel.H"
-    #include "createPyrolysisModel.H"
-    #include "createRadiationModel.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"
     #include "compressibleCourantNo.H"
@@ -77,7 +72,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "createTimeControls.H"
+        #include "readTimeControls.H"
         #include "compressibleCourantNo.H"
         #include "solidRegionDiffusionNo.H"
         #include "setMultiRegionDeltaT.H"
@@ -91,7 +86,10 @@ int main(int argc, char *argv[])
 
         surfaceFilm.evolve();
 
-        pyrolysis.evolve();
+        if(solvePyrolysisRegion)
+        {
+            pyrolysis.evolve();
+        }
 
         if (solvePrimaryRegion)
         {

applications/solvers/combustion/fireFoam/pEqn.H

@@ -4,7 +4,7 @@ volScalarField rAU(1.0/UEqn.A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
 volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
 
-surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
+surfaceScalarField phig("phig", -rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
 surfaceScalarField phiHbyA
 (
@@ -25,9 +25,10 @@ while (pimple.correctNonOrthogonal())
 {
     fvScalarMatrix p_rghEqn
     (
-        fvc::ddt(psi, rho)*gh
+        fvm::ddt(psi, p_rgh)
+      + fvc::ddt(psi, rho)*gh
+      + fvc::ddt(psi)*pRef
       + fvc::div(phiHbyA)
-      + fvm::ddt(psi, p_rgh)
       - fvm::laplacian(rhorAUf, p_rgh)
      ==
         parcels.Srho()
@@ -46,7 +47,7 @@ while (pimple.correctNonOrthogonal())
     }
 }
 
-p = p_rgh + rho*gh;
+p = p_rgh + rho*gh + pRef;
 
 #include "rhoEqn.H"
 #include "compressibleContinuityErrs.H"

applications/solvers/combustion/fireFoam/phrghEqn.H

@@ -0,0 +1,62 @@
+if (pimple.dict().lookupOrDefault<bool>("hydrostaticInitialization", false))
+{
+    volScalarField& ph_rgh = regIOobject::store
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "ph_rgh",
+                "0",
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh
+        )
+    );
+
+    if (equal(runTime.value(), 0))
+    {
+        p = ph_rgh + rho*gh + pRef;
+        thermo.correct();
+        rho = thermo.rho();
+
+        label nCorr
+        (
+            pimple.dict().lookupOrDefault<label>("nHydrostaticCorrectors", 5)
+        );
+
+        for (label i=0; i<nCorr; i++)
+        {
+            surfaceScalarField rhof("rhof", fvc::interpolate(rho));
+
+            surfaceScalarField phig
+            (
+                "phig",
+               -rhof*ghf*fvc::snGrad(rho)*mesh.magSf()
+            );
+
+            // Update the pressure BCs to ensure flux consistency
+            constrainPressure(ph_rgh, rho, U, phig, rhof);
+
+            fvScalarMatrix ph_rghEqn
+            (
+                fvm::laplacian(rhof, ph_rgh) == fvc::div(phig)
+            );
+
+            ph_rghEqn.solve();
+
+            p = ph_rgh + rho*gh + pRef;
+            thermo.correct();
+            rho = thermo.rho();
+
+            Info<< "Hydrostatic pressure variation "
+                << (max(ph_rgh) - min(ph_rgh)).value() << endl;
+        }
+
+        ph_rgh.write();
+
+        p_rgh = ph_rgh;
+    }
+}

applications/solvers/combustion/reactingFoam/YEqn.H

@@ -12,12 +12,11 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 {
     reaction->correct();
     dQ = reaction->dQ();
-    label inertIndex = -1;
     volScalarField Yt(0.0*Y[0]);
 
     forAll(Y, i)
     {
-        if (Y[i].name() != inertSpecie)
+        if (i != inertIndex && composition.active(i))
         {
             volScalarField& Yi = Y[i];
 
@@ -42,10 +41,6 @@ tmp<fv::convectionScheme<scalar>> mvConvection
             Yi.max(0.0);
             Yt += Yi;
         }
-        else
-        {
-            inertIndex = i;
-        }
     }
 
     Y[inertIndex] = scalar(1) - Yt;

applications/solvers/combustion/reactingFoam/createFieldRefs.H

@@ -0,0 +1,3 @@
+const volScalarField& psi = thermo.psi();
+const volScalarField& T = thermo.T();
+const label inertIndex(composition.species()[inertSpecie]);

applications/solvers/combustion/reactingFoam/createFields.H

@@ -11,7 +11,14 @@ thermo.validate(args.executable(), "h", "e");
 basicMultiComponentMixture& composition = thermo.composition();
 PtrList<volScalarField>& Y = composition.Y();
 
-word inertSpecie(thermo.lookup("inertSpecie"));
+const word inertSpecie(thermo.lookup("inertSpecie"));
+if (!composition.species().found(inertSpecie))
+{
+    FatalIOErrorIn(args.executable().c_str(), thermo)
+        << "Inert specie " << inertSpecie << " not found in available species "
+        << composition.species()
+        << exit(FatalIOError);
+}
 
 volScalarField rho
 (
@@ -40,8 +47,6 @@ volVectorField U
 
 
 volScalarField& p = thermo.p();
-const volScalarField& psi = thermo.psi();
-const volScalarField& T = thermo.T();
 
 #include "compressibleCreatePhi.H"
 
@@ -123,3 +128,5 @@ volScalarField dQ
     mesh,
     dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
 );
+
+#include "createMRF.H"

applications/solvers/combustion/reactingFoam/reactingFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,17 +45,17 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "createTimeControls.H"
     #include "createRDeltaT.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
 
     turbulence->validate();

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I$(FOAM_SOLVERS)/combustion/reactingFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFieldRefs.H

@@ -0,0 +1,3 @@
+const volScalarField& psi = thermo.psi();
+const volScalarField& T = thermo.T();
+const label inertIndex(composition.species()[inertSpecie]);

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H

@@ -11,7 +11,14 @@ thermo.validate(args.executable(), "h", "e");
 basicMultiComponentMixture& composition = thermo.composition();
 PtrList<volScalarField>& Y = composition.Y();
 
-word inertSpecie(thermo.lookup("inertSpecie"));
+const word inertSpecie(thermo.lookup("inertSpecie"));
+if (!composition.species().found(inertSpecie))
+{
+    FatalIOErrorIn(args.executable().c_str(), thermo)
+        << "Inert specie " << inertSpecie << " not found in available species "
+        << composition.species()
+        << exit(FatalIOError);
+}
 
 volScalarField rho
 (
@@ -40,8 +47,6 @@ volVectorField U
 
 
 volScalarField& p = thermo.p();
-const volScalarField& psi = thermo.psi();
-const volScalarField& T = thermo.T();
 
 
 #include "compressibleCreatePhi.H"
@@ -123,3 +128,5 @@ volScalarField dQ
     mesh,
     dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
 );
+
+#include "createMRF.H"

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C

@@ -28,8 +28,8 @@ Group
     grpCombustionSolvers
 
 Description
-    Solver for combustion with chemical reactions using density based
+    Solver for combustion with chemical reactions using a density based
-    thermodynamics package, using enahanced buoyancy treatment.
+    thermodynamics package with enhanced buoyancy treatment.
 
 \*---------------------------------------------------------------------------*/
 
@@ -46,17 +46,17 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "createTimeControls.H"
     #include "createRDeltaT.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
 
     turbulence->validate();

applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I$(FOAM_SOLVERS)/combustion/reactingFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \

applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFieldRefs.H

@@ -0,0 +1,3 @@
+const volScalarField& psi = thermo.psi();
+const volScalarField& T = thermo.T();
+const label inertIndex(composition.species()[inertSpecie]);

applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H

@@ -11,7 +11,14 @@ thermo.validate(args.executable(), "h", "e");
 basicMultiComponentMixture& composition = thermo.composition();
 PtrList<volScalarField>& Y = composition.Y();
 
-word inertSpecie(thermo.lookup("inertSpecie"));
+const word inertSpecie(thermo.lookup("inertSpecie"));
+if (!composition.species().found(inertSpecie))
+{
+    FatalIOErrorIn(args.executable().c_str(), thermo)
+        << "Inert specie " << inertSpecie << " not found in available species "
+        << composition.species()
+        << exit(FatalIOError);
+}
 
 volScalarField rho
 (
@@ -40,8 +47,6 @@ volVectorField U
 
 
 volScalarField& p = thermo.p();
-const volScalarField& psi = thermo.psi();
-const volScalarField& T = thermo.T();
 
 #include "compressibleCreatePhi.H"
 
@@ -102,3 +107,5 @@ volScalarField dQ
     mesh,
     dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
 );
+
+#include "createMRF.H"

applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,17 +46,17 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "createTimeControls.H"
     #include "createRDeltaT.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
 
     turbulence->validate();

applications/solvers/combustion/reactingFoam/setRDeltaT.H

@@ -58,24 +58,24 @@ License
 
     // Flow time scale
     {
-        rDeltaT.dimensionedInternalField() =
+        rDeltaT.ref() =
         (
-            fvc::surfaceSum(mag(phi))().dimensionedInternalField()
+            fvc::surfaceSum(mag(phi))()()
-           /((2*maxCo)*mesh.V()*rho.dimensionedInternalField())
+           /((2*maxCo)*mesh.V()*rho())
         );
 
         // Limit the largest time scale
         rDeltaT.max(1/maxDeltaT);
 
         Info<< "    Flow        = "
-            << gMin(1/rDeltaT.internalField()) << ", "
+            << gMin(1/rDeltaT.primitiveField()) << ", "
-            << gMax(1/rDeltaT.internalField()) << endl;
+            << gMax(1/rDeltaT.primitiveField()) << endl;
     }
 
     // Reaction source time scale
     if (alphaTemp < 1.0)
     {
-        volScalarField::DimensionedInternalField rDeltaTT
+        volScalarField::Internal rDeltaTT
         (
             mag(reaction->Sh())/(alphaTemp*rho*thermo.Cp()*T)
         );
@@ -84,9 +84,9 @@ License
             << gMin(1/(rDeltaTT.field() + VSMALL)) << ", "
             << gMax(1/(rDeltaTT.field() + VSMALL)) << endl;
 
-        rDeltaT.dimensionedInternalField() = max
+        rDeltaT.ref() = max
         (
-            rDeltaT.dimensionedInternalField(),
+            rDeltaT(),
             rDeltaTT
         );
     }
@@ -120,8 +120,8 @@ License
     rDeltaT.correctBoundaryConditions();
 
     Info<< "    Overall     = "
-        << gMin(1/rDeltaT.internalField())
+        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.internalField()) << endl;
+        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
 }
 
 

applications/solvers/compressible/rhoCentralFoam/Allwmake

@@ -2,10 +2,9 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-(wmake $targetType BCs && wmake && wmake rhoCentralDyMFoam)
+(wmake $targetType BCs && wmake $targetType && wmake $targetType rhoCentralDyMFoam)
 
 #------------------------------------------------------------------------------

applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H

@@ -44,17 +44,16 @@ Description
     \endvartable
 
 
-    \heading Patch usage
+Usage
-
     \table
-        Property     | Description             | Required    | Default value
+        Property     | Description                | Required    | Default value
-        pName        | Pressure field name     | no          | p
+        p            | Pressure field name        | no          | p
-        psiName      | Compressibility field name | no       | thermo:psi
+        psi          | Compressibility field name | no          | thermo:psi
     \endtable
 
     Example of the boundary condition specification:
     \verbatim
-    myPatch
+    <patchName>
     {
         type            fixedRho;
     }

applications/solvers/compressible/rhoCentralFoam/centralCourantNo.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
 
 if (mesh.nInternalFaces())
 {
-    scalarField sumAmaxSf(fvc::surfaceSum(amaxSf)().internalField());
+    scalarField sumAmaxSf(fvc::surfaceSum(amaxSf)().primitiveField());
 
     CoNum = 0.5*gMax(sumAmaxSf/mesh.V().field())*runTime.deltaTValue();
 

applications/solvers/compressible/rhoCentralFoam/createFieldRefs.H

@@ -0,0 +1,10 @@
+volScalarField& p = thermo.p();
+const volScalarField& T = thermo.T();
+const volScalarField& psi = thermo.psi();
+const volScalarField& mu = thermo.mu();
+
+bool inviscid(true);
+if (max(mu.primitiveField()) > 0.0)
+{
+    inviscid = false;
+}

applications/solvers/compressible/rhoCentralFoam/createFields.H

@@ -6,17 +6,7 @@ autoPtr<psiThermo> pThermo
 );
 psiThermo& thermo = pThermo();
 
-volScalarField& p = thermo.p();
 volScalarField& e = thermo.he();
-const volScalarField& T = thermo.T();
-const volScalarField& psi = thermo.psi();
-const volScalarField& mu = thermo.mu();
-
-bool inviscid(true);
-if (max(mu.internalField()) > 0.0)
-{
-    inviscid = false;
-}
 
 Info<< "Reading field U\n" << endl;
 volVectorField U

applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C

@@ -29,7 +29,7 @@ Group
 
 Description
     Density-based compressible flow solver based on central-upwind schemes of
-    Kurganov and Tadmor with support for mesh-motion and topology changes
+    Kurganov and Tadmor with support for mesh-motion and topology changes.
 
 \*---------------------------------------------------------------------------*/
 
@@ -45,10 +45,14 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #define NO_CONTROL
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
     #include "createFields.H"
+    #include "createFieldRefs.H"
     #include "createTimeControls.H"
 
     turbulence->validate();
@@ -188,11 +192,11 @@ int main(int argc, char *argv[])
         // --- Solve momentum
         solve(fvm::ddt(rhoU) + fvc::div(phiUp));
 
-        U.dimensionedInternalField() =
+        U.ref() =
-            rhoU.dimensionedInternalField()
+            rhoU()
-           /rho.dimensionedInternalField();
+           /rho();
         U.correctBoundaryConditions();
-        rhoU.boundaryField() == rho.boundaryField()*U.boundaryField();
+        rhoU.boundaryFieldRef() == rho.boundaryField()*U.boundaryField();
 
         if (!inviscid)
         {
@@ -226,7 +230,7 @@ int main(int argc, char *argv[])
         e = rhoE/rho - 0.5*magSqr(U);
         e.correctBoundaryConditions();
         thermo.correct();
-        rhoE.boundaryField() ==
+        rhoE.boundaryFieldRef() ==
             rho.boundaryField()*
             (
                 e.boundaryField() + 0.5*magSqr(U.boundaryField())
@@ -243,11 +247,11 @@ int main(int argc, char *argv[])
             rhoE = rho*(e + 0.5*magSqr(U));
         }
 
-        p.dimensionedInternalField() =
+        p.ref() =
-            rho.dimensionedInternalField()
+            rho()
-           /psi.dimensionedInternalField();
+           /psi();
         p.correctBoundaryConditions();
-        rho.boundaryField() == psi.boundaryField()*p.boundaryField();
+        rho.boundaryFieldRef() == psi.boundaryField()*p.boundaryField();
 
         turbulence->correct();
 

applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C

@@ -29,7 +29,7 @@ Group
 
 Description
     Density-based compressible flow solver based on central-upwind schemes of
-    Kurganov and Tadmor
+    Kurganov and Tadmor.
 
 \*---------------------------------------------------------------------------*/
 
@@ -45,11 +45,14 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #define NO_CONTROL
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
+    #include "createFieldRefs.H"
     #include "createTimeControls.H"
     #include "createRDeltaT.H"
 
@@ -181,11 +184,11 @@ int main(int argc, char *argv[])
         // --- Solve momentum
         solve(fvm::ddt(rhoU) + fvc::div(phiUp));
 
-        U.dimensionedInternalField() =
+        U.ref() =
-            rhoU.dimensionedInternalField()
+            rhoU()
-           /rho.dimensionedInternalField();
+           /rho();
         U.correctBoundaryConditions();
-        rhoU.boundaryField() == rho.boundaryField()*U.boundaryField();
+        rhoU.boundaryFieldRef() == rho.boundaryField()*U.boundaryField();
 
         if (!inviscid)
         {
@@ -219,7 +222,7 @@ int main(int argc, char *argv[])
         e = rhoE/rho - 0.5*magSqr(U);
         e.correctBoundaryConditions();
         thermo.correct();
-        rhoE.boundaryField() ==
+        rhoE.boundaryFieldRef() ==
             rho.boundaryField()*
             (
                 e.boundaryField() + 0.5*magSqr(U.boundaryField())
@@ -236,11 +239,11 @@ int main(int argc, char *argv[])
             rhoE = rho*(e + 0.5*magSqr(U));
         }
 
-        p.dimensionedInternalField() =
+        p.ref() =
-            rho.dimensionedInternalField()
+            rho()
-           /psi.dimensionedInternalField();
+           /psi();
         p.correctBoundaryConditions();
-        rho.boundaryField() == psi.boundaryField()*p.boundaryField();
+        rho.boundaryFieldRef() == psi.boundaryField()*p.boundaryField();
 
         turbulence->correct();
 

applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H

@@ -11,10 +11,10 @@
     );
 
     // Set the reciprocal time-step from the local Courant number
-    rDeltaT.dimensionedInternalField() = max
+    rDeltaT.ref() = max
     (
         1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT),
-        fvc::surfaceSum(amaxSf)().dimensionedInternalField()
+        fvc::surfaceSum(amaxSf)()()
        /((2*maxCo)*mesh.V())
     );
 
@@ -24,6 +24,6 @@
     fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff);
 
     Info<< "Flow time scale min/max = "
-        << gMin(1/rDeltaT.internalField())
+        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.internalField()) << endl;
+        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
 }

applications/solvers/compressible/rhoPimpleFoam/createFieldRefs.H

@@ -0,0 +1 @@
+const volScalarField& psi = thermo.psi();

applications/solvers/compressible/rhoPimpleFoam/createFields.H

@@ -8,7 +8,6 @@ psiThermo& thermo = pThermo();
 thermo.validate(args.executable(), "h", "e");
 
 volScalarField& p = thermo.p();
-const volScalarField& psi = thermo.psi();
 
 volScalarField rho
 (
@@ -90,3 +89,5 @@ volScalarField dpdt
 
 Info<< "Creating field kinetic energy K\n" << endl;
 volScalarField K("K", 0.5*magSqr(U));
+
+#include "createMRF.H"

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options

@@ -9,8 +9,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude
-    -I$(LIB_SRC)/meshTools/lnInclude \
 
 EXE_LIBS = \
     -lcompressibleTransportModels \
@@ -24,5 +23,4 @@ EXE_LIBS = \
     -lfvOptions \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
-    -ldynamicMesh \
+    -ldynamicMesh
-    -lmeshTools

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,8 @@ Group
     grpCompressibleSolvers grpMovingMeshSolvers
 
 Description
-    Transient solver for laminar or turbulent flow of compressible fluids
+    Transient solver for turbulent flow of compressible fluids for HVAC and
-    for HVAC and similar applications.
+    similar applications, with optional mesh motion and mesh topology changes.
 
     Uses the flexible PIMPLE (PISO-SIMPLE) solution for time-resolved and
     pseudo-transient simulations.
@@ -51,16 +51,16 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "createRDeltaT.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
     #include "createRhoUf.H"
     #include "createControls.H"

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,8 @@ Group
     grpCompressibleSolvers
 
 Description
-    Transient solver for laminar or turbulent flow of compressible fluids
+    Transient solver for turbulent flow of compressible fluids for HVAC and
-    for HVAC and similar applications.
+    similar applications.
 
     Uses the flexible PIMPLE (PISO-SIMPLE) solution for time-resolved and
     pseudo-transient simulations.
@@ -49,17 +49,17 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "createTimeControls.H"
     #include "createRDeltaT.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
 
     turbulence->validate();

applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H

@@ -26,11 +26,11 @@
     volScalarField rDeltaT0("rDeltaT0", rDeltaT);
 
     // Set the reciprocal time-step from the local Courant number
-    rDeltaT.dimensionedInternalField() = max
+    rDeltaT.ref() = max
     (
         1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT),
-        fvc::surfaceSum(mag(phi))().dimensionedInternalField()
+        fvc::surfaceSum(mag(phi))()()
-       /((2*maxCo)*mesh.V()*rho.dimensionedInternalField())
+       /((2*maxCo)*mesh.V()*rho())
     );
 
     if (pimple.transonic())
@@ -41,11 +41,11 @@
             fvc::interpolate(psi)*fvc::flux(U)
         );
 
-        rDeltaT.dimensionedInternalField() = max
+        rDeltaT.ref() = max
         (
-            rDeltaT.dimensionedInternalField(),
+            rDeltaT(),
-            fvc::surfaceSum(mag(phid))().dimensionedInternalField()
+            fvc::surfaceSum(mag(phid))()()
-            /((2*maxCo)*mesh.V()*psi.dimensionedInternalField())
+            /((2*maxCo)*mesh.V()*psi())
         );
     }
 
@@ -53,8 +53,8 @@
     rDeltaT.correctBoundaryConditions();
 
     Info<< "Flow time scale min/max = "
-        << gMin(1/rDeltaT.internalField())
+        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.internalField()) << endl;
+        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
 
     if (rDeltaTSmoothingCoeff < 1.0)
     {
@@ -62,8 +62,8 @@
     }
 
     Info<< "Smoothed flow time scale min/max = "
-        << gMin(1/rDeltaT.internalField())
+        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.internalField()) << endl;
+        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
 
     // Limit rate of change of time scale
     // - reduce as much as required
@@ -79,7 +79,7 @@
            *max(rDeltaT/rDeltaT0, scalar(1) - rDeltaTDampingCoeff);
 
         Info<< "Damped flow time scale min/max = "
-            << gMin(1/rDeltaT.internalField())
+            << gMin(1/rDeltaT.primitiveField())
-            << ", " << gMax(1/rDeltaT.internalField()) << endl;
+            << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
     }
 }

applications/solvers/compressible/rhoSimpleFoam/createFieldRefs.H

@@ -0,0 +1 @@
+const volScalarField& psi = thermo.psi();

applications/solvers/compressible/rhoSimpleFoam/createFields.H

@@ -21,7 +21,6 @@ volScalarField rho
 );
 
 volScalarField& p = thermo.p();
-const volScalarField& psi = thermo.psi();
 
 Info<< "Reading field U\n" << endl;
 volVectorField U
@@ -81,3 +80,5 @@ autoPtr<compressible::turbulenceModel> turbulence
 );
 
 dimensionedScalar initialMass = fvc::domainIntegrate(rho);
+
+#include "createMRF.H"

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I.. \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H

@@ -80,3 +80,5 @@ autoPtr<compressible::turbulenceModel> turbulence
 );
 
 dimensionedScalar initialMass = fvc::domainIntegrate(rho);
+
+#include "createMRF.H"

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,9 +28,8 @@ Group
     grpCompressibleSolvers
 
 Description
-    Steady-state solver for turbulent flow of compressible fluids with
+    Steady-state solver for turbulent flow of compressible fluids, with
-    RANS turbulence modelling, implicit or explicit porosity treatment
+    implicit or explicit porosity treatment and optional sources.
-    and run-time selectable finite volume sources.
 
 \*---------------------------------------------------------------------------*/
 
@@ -45,14 +44,13 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    simpleControl simple(mesh);
-
     #include "createFields.H"
-    #include "createMRF.H"
     #include "createFvOptions.H"
     #include "createZones.H"
     #include "initContinuityErrs.H"

applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,7 @@ Group
     grpCompressibleSolvers
 
 Description
-    Steady-state SIMPLE solver for laminar or turbulent RANS flow of
+    Steady-state solver for turbulent flow of compressible fluids.
-    compressible fluids.
 
 \*---------------------------------------------------------------------------*/
 
@@ -43,14 +42,14 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    simpleControl simple(mesh);
-
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 

applications/solvers/compressible/sonicFoam/Make/options

@@ -1,5 +1,4 @@
 EXE_INC = \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \

applications/solvers/compressible/sonicFoam/createFieldRefs.H

@@ -0,0 +1,2 @@
+volScalarField& e = thermo.he();
+const volScalarField& psi = thermo.psi();

applications/solvers/compressible/sonicFoam/createFields.H

@@ -8,8 +8,6 @@ psiThermo& thermo = pThermo();
 thermo.validate(args.executable(), "e");
 
 volScalarField& p = thermo.p();
-volScalarField& e = thermo.he();
-const volScalarField& psi = thermo.psi();
 
 volScalarField rho
 (
@@ -54,3 +52,5 @@ autoPtr<compressible::turbulenceModel> turbulence
 
 Info<< "Creating field kinetic energy K\n" << endl;
 volScalarField K("K", 0.5*magSqr(U));
+
+#include "createMRF.H"

applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options

@@ -2,7 +2,6 @@ EXE_INC = \
     -I.. \
     -I../../rhoPimpleFoam/rhoPimpleDyMFoam \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \

applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,8 @@ Group
     grpCompressibleSolvers grpMovingMeshSolvers
 
 Description
-    Transient solver for trans-sonic/supersonic, laminar or turbulent flow
+    Transient solver for trans-sonic/supersonic, turbulent flow of a
-    of a compressible gas with mesh motion..
+    compressible gas, with optional mesh motion and mesh topology changes.
 
 \*---------------------------------------------------------------------------*/
 
@@ -45,20 +45,20 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "initContinuityErrs.H"
+    #include "createControl.H"
-
-    pimpleControl pimple(mesh);
-
     #include "createControls.H"
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
     #include "createRhoUf.H"
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
+    #include "initContinuityErrs.H"
 
     turbulence->validate();
 

applications/solvers/compressible/sonicFoam/sonicFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,8 @@ Group
     grpCompressibleSolvers
 
 Description
-    Transient solver for trans-sonic/supersonic, laminar or turbulent flow
+    Transient solver for trans-sonic/supersonic, turbulent flow of a
-    of a compressible gas.
+    compressible gas.
 
 \*---------------------------------------------------------------------------*/
 
@@ -43,14 +43,14 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 

applications/solvers/compressible/sonicFoam/sonicLiquidFoam/createFields.H

@@ -1,3 +1,6 @@
+#include "readThermodynamicProperties.H"
+#include "readTransportProperties.H"
+
 Info<< "Reading field p\n" << endl;
 volScalarField p
 (

applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C

@@ -40,14 +40,12 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
-    #include "readThermodynamicProperties.H"
-    #include "readTransportProperties.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
 

applications/solvers/discreteMethods/dsmc/dsmcFoam/createFields.H

@@ -0,0 +1,2 @@
+Info<< nl << "Constructing dsmcCloud " << endl;
+dsmcCloud dsmc("dsmc", mesh);

applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,8 @@ Group
     grpDiscreteMethodsSolvers
 
 Description
-    Direct simulation Monte Carlo (DSMC) solver for 3D, transient, multi-
+    Direct simulation Monte Carlo (DSMC) solver for, transient, multi-species
-    species flows
+    flows.
 
 \*---------------------------------------------------------------------------*/
 
@@ -40,16 +40,16 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #define NO_CONTROL
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
+    #include "createFields.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    Info<< nl << "Constructing dsmcCloud " << endl;
-
-    dsmcCloud dsmc("dsmc", mesh);
-
     Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.loop())

applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C

@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2011 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2011-2016 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ Group
     grpDiscreteMethodsSolvers
 
 Description
-    Equilibrates and/or preconditions molecular dynamics systems
+    Solver to equilibrate and/or precondition molecular dynamics systems.
 
 \*---------------------------------------------------------------------------*/
 
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        if (runTime.outputTime())
+        if (runTime.writeTime())
         {
             nAveragingSteps = 0;
         }

applications/solvers/discreteMethods/molecularDynamics/mdFoam/createFields.H

@@ -1,55 +1,17 @@
-    Info<< "\nReading field U\n" << endl;
+Info<< "\nReading field U\n" << endl;
-    volVectorField U
+volVectorField U
-    (
+(
-        IOobject
+    IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    word polyatomicCloudName("polyatomicCloud");
-
-    potential polyPot
     (
+        "U",
+        runTime.timeName(),
         mesh,
-        IOdictionary
+        IOobject::MUST_READ,
-        (
+        IOobject::AUTO_WRITE
-            IOobject
+    ),
-            (
+    mesh
-                polyatomicCloudName +  "Properties",
+);
-                mesh.time().constant(),
-                mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
-            )
-        )
-    );
 
-    polyatomicCloud polyatomics(polyatomicCloudName, mesh, polyPot);
+potential pot(mesh);
 
-    word monoatomicCloudName("monoatomicCloud");
+moleculeCloud molecules(mesh, pot);
-
-    potential monoPot
-    (
-        mesh,
-        IOdictionary
-        (
-            IOobject
-            (
-                monoatomicCloudName +  "Properties",
-                mesh.time().constant(),
-                mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::NO_WRITE,
-                false
-            )
-        )
-    );
-
-    monoatomicCloud monoatomics(monoatomicCloudName, mesh, monoPot);

applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C

@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2011 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2011-2016 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -28,41 +28,28 @@ Group
     grpDiscreteMethodsSolvers
 
 Description
-    Molecular dynamics solver for fluid dynamics
+    Molecular dynamics solver for fluid dynamics.
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
 #include "md.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 int main(int argc, char *argv[])
 {
+    #define NO_CONTROL
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
+    #include "createFields.H"
+    #include "temperatureAndPressureVariables.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    Info<< "\nReading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    potential pot(mesh);
-
-    moleculeCloud molecules(mesh, pot);
-
-    #include "temperatureAndPressureVariables.H"
-
     label nAveragingSteps = 0;
 
     Info<< "\nStarting time loop\n" << endl;
@@ -76,12 +63,11 @@ int main(int argc, char *argv[])
         molecules.evolve();
 
         #include "meanMomentumEnergyAndNMols.H"
-
         #include "temperatureAndPressure.H"
 
         runTime.write();
 
-        if (runTime.outputTime())
+        if (runTime.writeTime())
         {
             nAveragingSteps = 0;
         }

applications/solvers/electromagnetics/mhdFoam/createControl.H

@@ -0,0 +1,2 @@
+pisoControl piso(mesh);
+pisoControl bpiso(mesh, "BPISO");

applications/solvers/electromagnetics/mhdFoam/createPhiB.H

@@ -1,47 +1,49 @@
-    IOobject phiBHeader
+IOobject phiBHeader
-    (
+(
-        "phiB",
+    "phiB",
-        runTime.timeName(),
+    runTime.timeName(),
-        mesh,
+    mesh,
-        IOobject::NO_READ
+    IOobject::NO_READ
-    );
+);
 
 
-    surfaceScalarField* phiBPtr;
+surfaceScalarField* phiBPtr = nullptr;
 
     if (phiBHeader.typeHeaderOk<surfaceScalarField>(true))
-    {
+{
-        Info<< "Reading field phiB\n" << endl;
+    Info<< "Reading face flux ";
 
-        phiBPtr = new surfaceScalarField
+    phiBPtr = new surfaceScalarField
+    (
+        IOobject
         (
-            IOobject
+            "phiB",
-            (
+            runTime.timeName(),
-                "phiB",
+            mesh,
-                runTime.timeName(),
+            IOobject::MUST_READ,
-                mesh,
+            IOobject::AUTO_WRITE
-                IOobject::MUST_READ,
+        ),
-                IOobject::AUTO_WRITE
+        mesh
-            ),
+    );
-            mesh
+}
-        );
+else
-    }
+{
-    else
+    Info<< "Calculating face flux ";
-    {
-        Info<< "Calculating face flux\n" << endl;
 
-        phiBPtr = new surfaceScalarField
+    phiBPtr = new surfaceScalarField
+    (
+        IOobject
         (
-            IOobject
+            "phiB",
-            (
+            runTime.timeName(),
-                "phiB",
+            mesh,
-                runTime.timeName(),
+            IOobject::NO_READ,
-                mesh,
+            IOobject::AUTO_WRITE
-                IOobject::NO_READ,
+        ),
-                IOobject::AUTO_WRITE
+        fvc::flux(B)
-            ),
+    );
-            fvc::flux(B)
+}
-        );
-    }
 
-    surfaceScalarField& phiB = *phiBPtr;
+surfaceScalarField& phiB = *phiBPtr;
+
+Info<< phiB.name() << nl << endl;

applications/solvers/electromagnetics/mhdFoam/mhdFoam.C

@@ -58,14 +58,12 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pisoControl piso(mesh);
-    pisoControl bpiso(mesh, "BPISO");
-
     #include "createFields.H"
     #include "initContinuityErrs.H"
 

applications/solvers/financial/financialFoam/financialFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,8 +40,10 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #define NO_CONTROL
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
@@ -72,7 +74,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        if (runTime.outputTime())
+        if (runTime.writeTime())
         {
             writeCellGraph(V, runTime.graphFormat());
             writeCellGraph(delta, runTime.graphFormat());

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I../buoyantBoussinesqSimpleFoam \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C

@@ -28,7 +28,7 @@ Group
     grpHeatTransferSolvers
 
 Description
-    Transient solver for buoyant, turbulent flow of incompressible fluids
+    Transient solver for buoyant, turbulent flow of incompressible fluids.
 
     Uses the Boussinesq approximation:
     \f[
@@ -59,20 +59,18 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "createFields.H"
-    #include "createIncompressibleRadiationModel.H"
-    #include "createMRF.H"
     #include "createFvOptions.H"
-    #include "initContinuityErrs.H"
     #include "createTimeControls.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
+    #include "initContinuityErrs.H"
 
     turbulence->validate();
 
@@ -80,14 +78,16 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.loop())
+    while (runTime.run())
     {
-        Info<< "Time = " << runTime.timeName() << nl << endl;
+        #include "readTimeControls.H"
-
-        #include "createTimeControls.H"
         #include "CourantNo.H"
         #include "setDeltaT.H"
 
+        runTime++;
+
+        Info<< "Time = " << runTime.timeName() << nl << endl;
+
         // --- Pressure-velocity PIMPLE corrector loop
         while (pimple.loop())
         {

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H

@@ -120,3 +120,6 @@ if (p_rgh.needReference())
 }
 
 mesh.setFluxRequired(p_rgh.name());
+
+#include "createMRF.H"
+#include "createIncompressibleRadiationModel.H"

applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C

@@ -28,7 +28,7 @@ Group
     grpHeatTransferSolvers
 
 Description
-    Steady-state solver for buoyant, turbulent flow of incompressible fluids
+    Steady-state solver for buoyant, turbulent flow of incompressible fluids.
 
     Uses the Boussinesq approximation:
     \f[
@@ -59,15 +59,13 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    simpleControl simple(mesh);
-
     #include "createFields.H"
-    #include "createIncompressibleRadiationModel.H"
-    #include "createMRF.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 

applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H

@@ -120,3 +120,6 @@ if (p_rgh.needReference())
 }
 
 mesh.setFluxRequired(p_rgh.name());
+
+#include "createMRF.H"
+#include "createIncompressibleRadiationModel.H"

applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C

@@ -47,16 +47,15 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
-    #include "createRadiationModel.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"
     #include "compressibleCourantNo.H"
@@ -70,7 +69,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "createTimeControls.H"
+        #include "readTimeControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
 

applications/solvers/heatTransfer/buoyantPimpleFoam/createFieldRefs.H

@@ -0,0 +1 @@
+const volScalarField& psi = thermo.psi();

applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H

@@ -114,3 +114,6 @@ if (p_rgh.needReference())
 }
 
 dimensionedScalar initialMass("initialMass", fvc::domainIntegrate(rho));
+
+#include "createMRF.H"
+#include "createRadiationModel.H"

applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C

@@ -44,16 +44,15 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    simpleControl simple(mesh);
-
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
-    #include "createRadiationModel.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/heatTransfer/buoyantSimpleFoam/createFieldRefs.H

@@ -0,0 +1 @@
+const volScalarField& psi = thermo.psi();