BUG: parse issues for nastran long format (closes #589)

- the regex was not being unset on assignment.
- drop unused recompile() method as being dubious

.gitignore

@@ -6,6 +6,8 @@
 .*~
 *.bak
 *.bak[0-9][0-9]
+*.orig
+*.orig[0-9][0-9]
 \#*\#
 
 # File-browser settings - anywhere
@@ -75,10 +77,9 @@ doc/Doxygen/DTAGS
 # Ignore .tags in the main directory
 /.tags
 
-# Ignore project files in the main directory
+# Ignore eclipse project files in the main directory
 /.cproject
 /.project
-/.dir-locals.el
 
 # Ignore the test directory
 /tutorialsTest

Allwmake

@@ -1,7 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Parse arguments for library compilation
+# Parse arguments for library compilation without documentation by default
+genDoc=0
+targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 wmakeCheckPwd "$WM_PROJECT_DIR" || {
@@ -25,25 +27,20 @@ if [ -d "$WM_THIRD_PARTY_DIR" ]
 then
     $WM_THIRD_PARTY_DIR/Allwmake
 else
-    echo "No ThirdParty directory found - skipping"
+    echo "Allwmake: no ThirdParty directory found - skipping"
 fi
 
-echo "========================================"
-echo "Compile OpenFOAM libraries"
-echo
+# Compile OpenFOAM libraries and applications
 src/Allwmake $targetType $*
 
-echo "========================================"
-echo "Compile OpenFOAM applications"
-echo
+# Compile OpenFOAM libraries and applications
 applications/Allwmake $targetType $*
 
-# Some summary information
-echo
-date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
-echo "========================================"
-echo "  ${WM_PROJECT_DIR##*/}"
-echo "  $WM_COMPILER $WM_COMPILER_TYPE compiler"
-echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
-echo
+# Optionally build OpenFOAM Doxygen documentation
+if [ $genDoc -eq 1 ]
+then
+    doc/Allwmake
+fi
+
+
 #------------------------------------------------------------------------------

BuildIssues.txt

@@ -1,63 +0,0 @@
-OpenFOAM-v1612+
-==================
-Known Build Issues
-==================
-
---------------
-Intel Compiler
---------------
-
-  Since OpenFOAM uses C++11, a fairly recent version is required.
-  The Intel compiler - icc (ICC) 17.0.1 20161005 is ok, but the
-  initial release - icc (ICC) 17.0.0 20160721 - has a bug that
-  will result in these types of error messages.
-
-    MatrixSpaceI.H(492): error: no instance of overloaded function
-    "Foam::MatrixSpace<Form, Cmpt, Mrows, Ncols>::Block<SubTensor,
-    BRowStart, BColStart>::operator=" matches the specified type
-
-
----
-VTK
----
-
-If using the runTimePostProcessing to create on-the-fly images, you
-can either simply just compile ParaView-5.0.1 and these libraries will
-be used.
-
-If you elect to use a separate VTK compilation (for example for
-off-screen rendering), it is advisable to reuse the VTK libraries that
-are provided with ParaView-5.0.1, by making an appropriate symlink
-prior to using makeVTK. This doesn't just reduce disk-space, but works
-much better than using the VTK-7.1.0.tar file.
-
-Using runTimePostProcessing with the 'plain' VTK-7.1.0 libraries does
-generally work, but does not exit cleanly:
-
-    symbol lookup error: .../linux64Gcc/VTK-7.1.0/lib/libvtkCommonExecutionModel-7.1.so.1:
-    undefined symbol: _ZN33vtkFilteringInformationKeyManager13ClassFinalizeEv
-
-    symbol lookup error: .../linux64Gcc/VTK-7.1.0/lib/libvtkCommonDataModel-7.1.so.1:
-    undefined symbol: _ZN49vtkInformationQuadratureSchemeDefinitionVectorKeyD1Ev
-
-This error appears to be suppressed if VTK is compiled with a Debug build-type.
-
-
--------------------------
-Building on older systems
--------------------------
-
-If the system gcc is too old for building OpenFOAM, a third-party gcc or
-clang/llvm installation can be used. If building clang/llvm, note that
-there are also minimum gcc/g++ requirements there:
-
-   Min gcc/g++
-   ===========   ==========
-    4.4          llvm-3.4.2
-    4.7          llvm-3.5.2 - llvm-3.7.0
-
-
-If your system compiler is too old to build the minimum required gcc or
-clang/llvm, it is just simply too old.
-
---

README.md

@@ -1,26 +1,22 @@
 # About OpenFOAM
-OpenFOAM is a free, open source CFD software [released and developed primarily by OpenCFD Ltd](http://www.openfoam.com) since 2004released and developed primarily by. It has a large user base across most areas of engineering and science, from both commercial and academic organisations. OpenFOAM has an extensive range of features to solve anything from complex fluid flows involving chemical reactions, turbulence and heat transfer, to acoustics, solid mechanics and electromagnetics.  [More...](http://www.openfoam.com/documentation)
+OpenFOAM is a free, open source CFD software package developed primarily by [OpenCFD](http://www.openfoam.com) since 2004 and is currently distributed by [ESI-OpenCFD](http://www.openfoam.com) and the [OpenFOAM Foundation](http://openfoam.org). It has a large user base across most areas of engineering and science, from both commercial and academic organisations. OpenFOAM has an extensive range of features to solve anything from complex fluid flows involving chemical reactions, turbulence and heat transfer, to acoustics, solid mechanics and electromagnetics.  [More...](http://www.openfoam.com/documentation)
 
-OpenFOAM+ is professionally released every six months to include customer sponsored developments and contributions from the community, including the OpenFOAM Foundation. Releases designated OpenFOAM+ contain several man years of client-sponsored developments of which much has been transferred to, but not released in the OpenFOAM Foundation branch.
+OpenFOAM+ uses the OpenFOAM Foundation version as a common code base, with wider functionality and platform support. Its purpose is to accelerate the public availability of new features which are sponsored by OpenCFD's customers and contributed by the OpenFOAM community.
 
 
 # Copyright
-OpenFOAM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.  See the file COPYING in this directory or [http://www.gnu.org/licenses/](http://www.gnu.org/licenses), for a description of the GNU General Public License terms under which you can copy the files.
+OpenFOAM+ is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.  See the file COPYING in this directory or [http://www.gnu.org/licenses/](http://www.gnu.org/licenses/), for a description of the GNU General Public License terms under which you can copy the files.
 
 
 # OpenFOAM Trademark
-OpenCFD Ltd grants use of the OpenFOAM trademark by Third Parties on a licence basis. ESI Group and the OpenFOAM Foundation Ltd are currently permitted to use the trademark. For information on trademark use, please refer to the [trademark policy guidelines](http://www.openfoam.com/legal/trademark-policy.php).
-
-Please [contact OpenCFD](http://www.openfoam.com/contact) if you have any questions on the use of the OpenFOAM trademark.
-
-Violations of the Trademark are continuously monitored, and will be duly prosecuted. 
+OpenCFD Limited, owner of the OpenFOAM Trademark, has granted the use of the Trademark to the OpenFOAM Foundation.  Violations of the Trademark are continuously monitored and will be duly prosecuted. Please [contact OpenCFD](http://www.openfoam.com/contact) if you have any questions on the use of the OpenFOAM trademark.
 
 
 # Useful Links
-- [Download and installation instructions](http://www.openfoam.com/download/)
+- [Download and installation instructions](http://www.openfoam.com/releases)
 - [Documentation](http://www.openfoam.com/documentation)
-- [Reporting bugs/issues/feature requests](http://www.openfoam.com/code/bug-reporting.php)
-- [OpenFOAM Community](http://www.openfoam.com/community/)
-- [Contacting OpenCFD](http://www.openfoam.com/contact/)
+- [Reporting bugs/issues (including bugs/suggestions/feature requests) in OpenFOAM+](http://www.openfoam.com/code/bug-reporting.php)
+- [Collaborative and Community-based Developments](http://www.openfoam.com/services/community-projects.php)
+- [Contacting OpenCFD](http://www.openfoam.com/contact)
 
 Copyright 2016 OpenCFD Ltd

applications/Allwmake

@@ -2,6 +2,7 @@
 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" || {
@@ -17,7 +18,10 @@ wmakeCheckPwd "$WM_PROJECT_DIR/applications" || {
     exit 1
 }
 
-wmake -all $targetType solvers
-wmake -all $targetType utilities
+set -x
+
+wmake -all solvers $*
+wmake -all utilities $*
+
 
 #------------------------------------------------------------------------------

applications/solvers/DNS/dnsFoam/Allwmake

@@ -6,7 +6,9 @@ if [ -f "$FFTW_ARCH_PATH/include/fftw3.h" ] || \
 then
     wmake
 else
-    echo "==> skip dnsFoam solver (no FFTW)"
+    echo
+    echo "Skipping dnsFoam solver (no FFTW)"
+    echo
 fi
 
 #------------------------------------------------------------------------------

applications/solvers/DNS/dnsFoam/createFields.H

@@ -1,5 +1,3 @@
-#include "readTransportProperties.H"
-
 Info<< "Reading field p\n" << endl;
 volScalarField p
 (
@@ -31,5 +29,3 @@ 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,13 +44,16 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #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"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -61,7 +64,7 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        force.primitiveFieldRef() = ReImSum
+        force.internalField() = ReImSum
         (
             fft::reverseTransform
             (
@@ -116,7 +119,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        if (runTime.writeTime())
+        if (runTime.outputTime())
         {
             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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "fvOptions.H"
 #include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -67,7 +66,6 @@ int main(int argc, char *argv[])
     simpleControl simple(mesh);
 
     #include "createFields.H"
-    #include "createFvOptions.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -79,16 +77,10 @@ int main(int argc, char *argv[])
 
         while (simple.correctNonOrthogonal())
         {
-            fvScalarMatrix TEqn
+            solve
             (
                 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.writeTime())
+    if (runTime.outputTime())
     {
         volVectorField gradT(fvc::grad(T));
 

applications/solvers/basic/potentialFoam/createControls.H

@@ -1,9 +0,0 @@
-const dictionary& potentialFlow
-(
-    mesh.solutionDict().subDict("potentialFlow")
-);
-
-const int nNonOrthCorr
-(
-    potentialFlow.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0)
-);

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
+// Infer the pressure BCs from the velocity BCs
 wordList pBCTypes
 (
     U.boundaryField().size(),
@@ -78,37 +78,63 @@ volScalarField p
     pBCTypes
 );
 
-// Infer the velocity potential BCs from the pressure
-wordList PhiBCTypes
-(
-    p.boundaryField().size(),
-    zeroGradientFvPatchScalarField::typeName
-);
-
-forAll(p.boundaryField(), patchi)
+label pRefCell = 0;
+scalar pRefValue = 0.0;
+if (args.optionFound("writep"))
 {
-    if (p.boundaryField()[patchi].fixesValue())
-    {
-        PhiBCTypes[patchi] = fixedValueFvPatchScalarField::typeName;
-    }
+    setRefCell
+    (
+        p,
+        potentialFlow.dict(),
+        pRefCell,
+        pRefValue
+    );
 }
 
+
 Info<< "Constructing velocity potential field Phi\n" << endl;
-volScalarField Phi
+autoPtr<volScalarField> PhiPtr;
+
+IOobject io
 (
-    IOobject
-    (
-        "Phi",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::NO_WRITE
-    ),
+    "Phi",
+    runTime.timeName(),
     mesh,
-    dimensionedScalar("Phi", dimLength*dimVelocity, 0),
-    PhiBCTypes
+    IOobject::MUST_READ,
+    IOobject::NO_WRITE
 );
 
+if (io.typeHeaderOk<volScalarField>())
+{
+    PhiPtr.reset(new volScalarField(io, mesh));
+}
+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()));
+    }
+}
+volScalarField& Phi = PhiPtr();
+
 label PhiRefCell = 0;
 scalar PhiRefValue = 0;
 setRefCell
@@ -119,5 +145,3 @@ setRefCell
     PhiRefValue
 );
 mesh.setFluxRequired(Phi.name());
-
-#include "createMRF.H"

applications/solvers/basic/potentialFoam/potentialFoam.C

@@ -28,9 +28,7 @@ Group
     grpBasicSolvers
 
 Description
-    Potential flow solver which solves for the velocity potential, to
-    calculate the flux-field, from which the velocity field is obtained by
-    reconstructing the flux.
+    Potential flow solver.
 
     \heading Solver details
     The potential flow solution is typically employed to generate initial fields
@@ -132,6 +130,7 @@ int main(int argc, char *argv[])
     pisoControl potentialFlow(mesh, "potentialFlow");
 
     #include "createFields.H"
+    #include "createMRF.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,16 +87,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 "readCombustionProperties.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
-    #include "createFieldRefs.H"
+    #include "createMRF.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"
@@ -112,7 +113,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readTimeControls.H"
+        #include "createTimeControls.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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readTimeControls.H"
+        #include "createTimeControls.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.primitiveFieldRef() = Nv.primitiveField()*Cw;
+    N.internalField() = Nv.internalField()*Cw;
 
     volSymmTensorField ns
     (
@@ -125,7 +125,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::basicSubGrid::XiEq() const
             Zero
         )
     );
-    ns.primitiveFieldRef() = nsv.primitiveField()*Cw;
+    ns.internalField() = nsv.internalField()*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.primitiveField()*Cw);
+    scalarField N(Nv.internalField()*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_.boundaryFieldRef().updateCoeffs();
+    epsilon_.boundaryField().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_.boundaryFieldRef());
+    epsEqn.ref().boundaryManipulate(epsilon_.boundaryField());
 
     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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,8 +36,8 @@ Description
     {
        scalarField sumPhi
         (
-            fvc::surfaceSum(mag(phiSt))().primitiveField()
-          / rho.primitiveField()
+            fvc::surfaceSum(mag(phiSt))().internalField()
+          / rho.internalField()
         );
 
         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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::Gulder::XiEq() const
 
     if (subGridSchelkin_)
     {
-        up.primitiveFieldRef() += calculateSchelkinEffect(uPrimeCoef_);
+        up.internalField() += 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.primitiveFieldRef() += calculateSchelkinEffect(uPrimeCoef_);
+        up.internalField() += calculateSchelkinEffect(uPrimeCoef_);
     }
 
     volScalarField l(lCoef_*sqrt(3.0/2.0)*up*k/epsilon);
@@ -119,11 +119,9 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::SCOPEXiEq::XiEq() const
         }
     }
 
-    volScalarField::Boundary& xieqBf = xieq.boundaryFieldRef();
-
     forAll(xieq.boundaryField(), patchi)
     {
-        scalarField& xieqp = xieqBf[patchi];
+        scalarField& xieqp = xieq.boundaryField()[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.primitiveFieldRef() = Nv.primitiveField()*pow(mesh.V(), 2.0/3.0);
+    N.internalField() = Nv.internalField()*pow(mesh.V(), 2.0/3.0);
 
     volSymmTensorField ns
     (
@@ -134,7 +134,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const
             Zero
         )
     );
-    ns.primitiveFieldRef() = nsv.primitiveField()*pow(mesh.V(), 2.0/3.0);
+    ns.internalField() = nsv.internalField()*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.primitiveFieldRef() = upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0);
+    N.internalField() = upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0);
 
     return tN;
 }

applications/solvers/combustion/PDRFoam/createFieldRefs.H

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

applications/solvers/combustion/PDRFoam/createFields.H

@@ -23,6 +23,7 @@ volScalarField rho
 );
 
 volScalarField& p = thermo.p();
+const volScalarField& psi = thermo.psi();
 
 volScalarField& b = composition.Y("b");
 Info<< "min(b) = " << min(b).value() << endl;
@@ -226,5 +227,3 @@ 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,11 +266,9 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Su0pTphi
         Su0[celli] = Su0pTphi(p[celli], Tu[celli], phi);
     }
 
-    volScalarField::Boundary& Su0Bf = Su0.boundaryFieldRef();
-
-    forAll(Su0Bf, patchi)
+    forAll(Su0.boundaryField(), patchi)
     {
-        scalarField& Su0p = Su0Bf[patchi];
+        scalarField& Su0p = Su0.boundaryField()[patchi];
         const scalarField& pp = p.boundaryField()[patchi];
         const scalarField& Tup = Tu.boundaryField()[patchi];
 
@@ -315,11 +313,9 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Su0pTphi
         Su0[celli] = Su0pTphi(p[celli], Tu[celli], phi[celli]);
     }
 
-    volScalarField::Boundary& Su0Bf = Su0.boundaryFieldRef();
-
-    forAll(Su0Bf, patchi)
+    forAll(Su0.boundaryField(), patchi)
     {
-        scalarField& Su0p = Su0Bf[patchi];
+        scalarField& Su0p = Su0.boundaryField()[patchi];
         const scalarField& pp = p.boundaryField()[patchi];
         const scalarField& Tup = Tu.boundaryField()[patchi];
         const scalarField& phip = phi.boundaryField()[patchi];
@@ -369,11 +365,9 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Ma
         ma[celli] = Ma(phi[celli]);
     }
 
-    volScalarField::Boundary& maBf = ma.boundaryFieldRef();
-
-    forAll(maBf, patchi)
+    forAll(ma.boundaryField(), patchi)
     {
-        scalarField& map = maBf[patchi];
+        scalarField& map = ma.boundaryField()[patchi];
         const scalarField& phip = phi.boundaryField()[patchi];
 
         forAll(map, facei)

applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C

@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,26 +67,25 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "postProcess.H"
-
     #include "setRootCase.H"
+
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "createControl.H"
+    #include "initContinuityErrs.H"
+
+    pimpleControl pimple(mesh);
+
     #include "readCombustionProperties.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
-    #include "createFieldRefs.H"
+    #include "createMRF.H"
     #include "createFvOptions.H"
-    #include "initContinuityErrs.H"
     #include "createRhoUf.H"
     #include "createControls.H"
     #include "initContinuityErrs.H"
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
-    turbulence->validate();
-
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;

applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H

@@ -1,6 +1,7 @@
-#include "readTimeControls.H"
+    #include "readTimeControls.H"
 
-correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
+    bool correctPhi =
+        pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
 
-checkMeshCourantNo =
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
+    bool checkMeshCourantNo =
+        pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);

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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,15 +65,16 @@ 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 "readCombustionProperties.H"
     #include "createFields.H"
-    #include "createFieldRefs.H"
+    #include "createMRF.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"
@@ -88,7 +89,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readTimeControls.H"
+        #include "createTimeControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
 

applications/solvers/combustion/XiFoam/createFieldRefs.H

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

applications/solvers/combustion/XiFoam/createFields.H

@@ -23,6 +23,7 @@ volScalarField rho
 );
 
 volScalarField& p = thermo.p();
+const volScalarField& psi = thermo.psi();
 
 volScalarField& b = composition.Y("b");
 Info<< "min(b) = " << min(b).value() << endl;
@@ -138,5 +139,3 @@ 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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,10 +28,12 @@ Group
     grpCombustionSolvers
 
 Description
-    Solver for chemistry problems, designed for use on single cell cases to
-    provide comparison against other chemistry solvers, that uses a single cell
-    mesh, and fields created from the initial conditions.
+    Solver for chemistry problems designed for use on single cell cases to
+    provide comparison against other chemistry solvers
 
+    Note:
+    - single cell mesh created on-the-fly
+    - fields created on the fly from the initial conditions
 
 \*---------------------------------------------------------------------------*/
 
@@ -50,15 +52,10 @@ 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

@@ -1,4 +0,0 @@
-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

@@ -12,7 +12,7 @@
         (
             "initialConditions",
             runTime.constant(),
-            mesh,
+            runTime,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE
         )
@@ -27,30 +27,36 @@
     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
         (
             "rho",
             runTime.timeName(),
-            mesh,
+            runTime,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
         thermo.rho()
     );
 
+    volScalarField& p = thermo.p();
+
     volScalarField Rspecific
     (
         IOobject
         (
             "Rspecific",
             runTime.timeName(),
-            mesh,
+            runTime,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
@@ -69,7 +75,7 @@
         (
             "U",
             runTime.timeName(),
-            mesh,
+            runTime,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),

applications/solvers/combustion/coldEngineFoam/Make/options

@@ -1,5 +1,4 @@
 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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,16 +45,15 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #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 "createFieldRefs.H"
+    #include "createMRF.H"
     #include "createFvOptions.H"
     #include "createRhoUf.H"
     #include "initContinuityErrs.H"

applications/solvers/combustion/coldEngineFoam/createFieldRefs.H

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

applications/solvers/combustion/coldEngineFoam/createFields.H

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

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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,17 +68,16 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #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 "createFieldRefs.H"
+    #include "createMRF.H"
     #include "createFvOptions.H"
     #include "createRhoUf.H"
     #include "initContinuityErrs.H"

applications/solvers/combustion/fireFoam/Make/options

@@ -21,6 +21,7 @@ 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 \
@@ -28,6 +29,7 @@ EXE_INC = \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude
 
+
 EXE_LIBS = \
     -lfiniteVolume \
     -lfvOptions \

applications/solvers/combustion/fireFoam/YEEqn.H

@@ -9,13 +9,15 @@ 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 (i != inertIndex && composition.active(i))
+        if (Y[i].name() != inertSpecie)
         {
             volScalarField& Yi = Y[i];
 
@@ -42,6 +44,10 @@ 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

@@ -1,4 +0,0 @@
-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,13 +19,6 @@ 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
@@ -42,6 +35,8 @@ volScalarField rho
 );
 
 volScalarField& p = thermo.p();
+const volScalarField& T = thermo.T();
+const volScalarField& psi = thermo.psi();
 
 Info<< "\nReading field U\n" << endl;
 volVectorField U
@@ -59,9 +54,6 @@ volVectorField U
 
 #include "compressibleCreatePhi.H"
 
-#include "createMRF.H"
-
-
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::turbulenceModel> turbulence
 (
@@ -77,60 +69,6 @@ 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
@@ -162,7 +100,51 @@ volScalarField dpdt
 Info<< "Creating field kinetic energy K\n" << endl;
 volScalarField K("K", 0.5*magSqr(U));
 
-#include "createClouds.H"
-#include "createSurfaceFilmModel.H"
-#include "createPyrolysisModel.H"
-#include "createRadiationModel.H"
+
+#include "readGravitationalAcceleration.H"
+#include "readhRef.H"
+#include "gh.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,3 +3,4 @@ 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 solver for fires and turbulent diffusion flames with reacting
-    particle clouds, surface film and pyrolysis modelling.
+    Transient PIMPLE solver for fires and turbulent diffusion flames with
+    reacting Lagrangian parcels, surface film and pyrolysis modelling.
 
 \*---------------------------------------------------------------------------*/
 
@@ -49,15 +49,20 @@ 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 "createFieldRefs.H"
+    #include "createMRF.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"
@@ -72,7 +77,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readTimeControls.H"
+        #include "createTimeControls.H"
         #include "compressibleCourantNo.H"
         #include "solidRegionDiffusionNo.H"
         #include "setMultiRegionDeltaT.H"
@@ -86,10 +91,7 @@ int main(int argc, char *argv[])
 
         surfaceFilm.evolve();
 
-        if(solvePyrolysisRegion)
-        {
-            pyrolysis.evolve();
-        }
+        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("phig", -rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
+surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
 surfaceScalarField phiHbyA
 (
@@ -25,10 +25,9 @@ while (pimple.correctNonOrthogonal())
 {
     fvScalarMatrix p_rghEqn
     (
-        fvm::ddt(psi, p_rgh)
-      + fvc::ddt(psi, rho)*gh
-      + fvc::ddt(psi)*pRef
+        fvc::ddt(psi, rho)*gh
       + fvc::div(phiHbyA)
+      + fvm::ddt(psi, p_rgh)
       - fvm::laplacian(rhorAUf, p_rgh)
      ==
         parcels.Srho()
@@ -47,7 +46,7 @@ while (pimple.correctNonOrthogonal())
     }
 }
 
-p = p_rgh + rho*gh + pRef;
+p = p_rgh + rho*gh;
 
 #include "rhoEqn.H"
 #include "compressibleContinuityErrs.H"

applications/solvers/combustion/fireFoam/phrghEqn.H

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

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

applications/solvers/combustion/reactingFoam/createFields.H

@@ -1,5 +1,3 @@
-#include "createRDeltaT.H"
-
 Info<< "Creating reaction model\n" << endl;
 
 autoPtr<combustionModels::psiCombustionModel> reaction
@@ -13,14 +11,7 @@ thermo.validate(args.executable(), "h", "e");
 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);
-}
+word inertSpecie(thermo.lookup("inertSpecie"));
 
 volScalarField rho
 (
@@ -49,6 +40,8 @@ volVectorField U
 
 
 volScalarField& p = thermo.p();
+const volScalarField& psi = thermo.psi();
+const volScalarField& T = thermo.T();
 
 #include "compressibleCreatePhi.H"
 
@@ -130,5 +123,3 @@ 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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,16 +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 "createFieldRefs.H"
+    #include "createMRF.H"
     #include "createFvOptions.H"
 
     turbulence->validate();

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

@@ -1,5 +1,4 @@
 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

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

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

@@ -1,5 +1,3 @@
-#include "createRDeltaT.H"
-
 Info<< "Creating reaction model\n" << endl;
 
 autoPtr<combustionModels::rhoCombustionModel> reaction
@@ -13,14 +11,7 @@ thermo.validate(args.executable(), "h", "e");
 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);
-}
+word inertSpecie(thermo.lookup("inertSpecie"));
 
 volScalarField rho
 (
@@ -49,6 +40,8 @@ volVectorField U
 
 
 volScalarField& p = thermo.p();
+const volScalarField& psi = thermo.psi();
+const volScalarField& T = thermo.T();
 
 
 #include "compressibleCreatePhi.H"
@@ -130,5 +123,3 @@ 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 a density based
-    thermodynamics package with enhanced buoyancy treatment.
+    Solver for combustion with chemical reactions using density based
+    thermodynamics package, using enahanced buoyancy treatment.
 
 \*---------------------------------------------------------------------------*/
 
@@ -46,16 +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 "createFieldRefs.H"
+    #include "createMRF.H"
     #include "createFvOptions.H"
 
     turbulence->validate();

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

@@ -1,5 +1,4 @@
 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

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

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

@@ -1,5 +1,3 @@
-#include "createRDeltaT.H"
-
 Info<< "Creating reaction model\n" << endl;
 
 autoPtr<combustionModels::rhoCombustionModel> reaction
@@ -13,14 +11,7 @@ thermo.validate(args.executable(), "h", "e");
 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);
-}
+word inertSpecie(thermo.lookup("inertSpecie"));
 
 volScalarField rho
 (
@@ -49,6 +40,8 @@ volVectorField U
 
 
 volScalarField& p = thermo.p();
+const volScalarField& psi = thermo.psi();
+const volScalarField& T = thermo.T();
 
 #include "compressibleCreatePhi.H"
 
@@ -109,5 +102,3 @@ 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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,16 +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 "createFieldRefs.H"
+    #include "createMRF.H"
     #include "createFvOptions.H"
 
     turbulence->validate();

applications/solvers/combustion/reactingFoam/setRDeltaT.H

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

applications/solvers/compressible/rhoCentralFoam/Allwclean

@@ -1,5 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+set -x
 
 wclean libso BCs
 wclean

applications/solvers/compressible/rhoCentralFoam/Allwmake

@@ -2,8 +2,10 @@
 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 $targetType && wmake $targetType rhoCentralDyMFoam)
+(wmake $targetType BCs && wmake && wmake rhoCentralDyMFoam)
 
 #------------------------------------------------------------------------------

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

@@ -44,16 +44,17 @@ Description
     \endvartable
 
 
-Usage
+    \heading Patch usage
+
     \table
-        Property     | Description                | Required    | Default value
-        p            | Pressure field name        | no          | p
-        psi          | Compressibility field name | no          | thermo:psi
+        Property     | Description             | Required    | Default value
+        pName        | Pressure field name     | no          | p
+        psiName      | Compressibility field name | no       | thermo:psi
     \endtable
 
     Example of the boundary condition specification:
     \verbatim
-    <patchName>
+    myPatch
     {
         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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
 
 if (mesh.nInternalFaces())
 {
-    scalarField sumAmaxSf(fvc::surfaceSum(amaxSf)().primitiveField());
+    scalarField sumAmaxSf(fvc::surfaceSum(amaxSf)().internalField());
 
     CoNum = 0.5*gMax(sumAmaxSf/mesh.V().field())*runTime.deltaTValue();
 

applications/solvers/compressible/rhoCentralFoam/createFieldRefs.H

@@ -1,10 +0,0 @@
-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

@@ -1,5 +1,3 @@
-#include "createRDeltaT.H"
-
 Info<< "Reading thermophysical properties\n" << endl;
 
 autoPtr<psiThermo> pThermo
@@ -8,7 +6,17 @@ 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
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,22 +39,16 @@ Description
 #include "turbulentFluidThermoModel.H"
 #include "fixedRhoFvPatchScalarField.H"
 #include "directionInterpolate.H"
-#include "localEulerDdtScheme.H"
-#include "fvcSmooth.H"
 #include "motionSolver.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 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();
@@ -194,11 +188,11 @@ int main(int argc, char *argv[])
         // --- Solve momentum
         solve(fvm::ddt(rhoU) + fvc::div(phiUp));
 
-        U.ref() =
-            rhoU()
-           /rho();
+        U.dimensionedInternalField() =
+            rhoU.dimensionedInternalField()
+           /rho.dimensionedInternalField();
         U.correctBoundaryConditions();
-        rhoU.boundaryFieldRef() == rho.boundaryField()*U.boundaryField();
+        rhoU.boundaryField() == rho.boundaryField()*U.boundaryField();
 
         if (!inviscid)
         {
@@ -232,7 +226,7 @@ int main(int argc, char *argv[])
         e = rhoE/rho - 0.5*magSqr(U);
         e.correctBoundaryConditions();
         thermo.correct();
-        rhoE.boundaryFieldRef() ==
+        rhoE.boundaryField() ==
             rho.boundaryField()*
             (
                 e.boundaryField() + 0.5*magSqr(U.boundaryField())
@@ -249,11 +243,11 @@ int main(int argc, char *argv[])
             rhoE = rho*(e + 0.5*magSqr(U));
         }
 
-        p.ref() =
-            rho()
-           /psi();
+        p.dimensionedInternalField() =
+            rho.dimensionedInternalField()
+           /psi.dimensionedInternalField();
         p.correctBoundaryConditions();
-        rho.boundaryFieldRef() == psi.boundaryField()*p.boundaryField();
+        rho.boundaryField() == 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,15 +45,13 @@ 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"
-    #include "createFieldRefs.H"
     #include "createTimeControls.H"
+    #include "createRDeltaT.H"
 
     turbulence->validate();
 
@@ -183,11 +181,11 @@ int main(int argc, char *argv[])
         // --- Solve momentum
         solve(fvm::ddt(rhoU) + fvc::div(phiUp));
 
-        U.ref() =
-            rhoU()
-           /rho();
+        U.dimensionedInternalField() =
+            rhoU.dimensionedInternalField()
+           /rho.dimensionedInternalField();
         U.correctBoundaryConditions();
-        rhoU.boundaryFieldRef() == rho.boundaryField()*U.boundaryField();
+        rhoU.boundaryField() == rho.boundaryField()*U.boundaryField();
 
         if (!inviscid)
         {
@@ -221,7 +219,7 @@ int main(int argc, char *argv[])
         e = rhoE/rho - 0.5*magSqr(U);
         e.correctBoundaryConditions();
         thermo.correct();
-        rhoE.boundaryFieldRef() ==
+        rhoE.boundaryField() ==
             rho.boundaryField()*
             (
                 e.boundaryField() + 0.5*magSqr(U.boundaryField())
@@ -238,11 +236,11 @@ int main(int argc, char *argv[])
             rhoE = rho*(e + 0.5*magSqr(U));
         }
 
-        p.ref() =
-            rho()
-           /psi();
+        p.dimensionedInternalField() =
+            rho.dimensionedInternalField()
+           /psi.dimensionedInternalField();
         p.correctBoundaryConditions();
-        rho.boundaryFieldRef() == psi.boundaryField()*p.boundaryField();
+        rho.boundaryField() == 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.ref() = max
+    rDeltaT.dimensionedInternalField() = max
     (
         1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT),
-        fvc::surfaceSum(amaxSf)()()
+        fvc::surfaceSum(amaxSf)().dimensionedInternalField()
        /((2*maxCo)*mesh.V())
     );
 
@@ -24,6 +24,6 @@
     fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff);
 
     Info<< "Flow time scale min/max = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+        << gMin(1/rDeltaT.internalField())
+        << ", " << gMax(1/rDeltaT.internalField()) << endl;
 }

applications/solvers/compressible/rhoPimpleFoam/createFieldRefs.H

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

applications/solvers/compressible/rhoPimpleFoam/createFields.H

@@ -1,5 +1,3 @@
-#include "createRDeltaT.H"
-
 Info<< "Reading thermophysical properties\n" << endl;
 
 autoPtr<psiThermo> pThermo
@@ -10,6 +8,7 @@ psiThermo& thermo = pThermo();
 thermo.validate(args.executable(), "h", "e");
 
 volScalarField& p = thermo.p();
+const volScalarField& psi = thermo.psi();
 
 volScalarField rho
 (
@@ -91,5 +90,3 @@ 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,7 +9,8 @@ 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 \
@@ -23,4 +24,5 @@ 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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,8 @@ Group
     grpCompressibleSolvers grpMovingMeshSolvers
 
 Description
-    Transient solver for turbulent flow of compressible fluids for HVAC and
-    similar applications, with optional mesh motion and mesh topology changes.
+    Transient solver for laminar or turbulent flow of compressible fluids
+    for HVAC and similar applications.
 
     Uses the flexible PIMPLE (PISO-SIMPLE) solution for time-resolved and
     pseudo-transient simulations.
@@ -51,15 +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 "createFieldRefs.H"
+    #include "createMRF.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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,8 @@ Group
     grpCompressibleSolvers
 
 Description
-    Transient solver for turbulent flow of compressible fluids for HVAC and
-    similar applications.
+    Transient solver for laminar or turbulent flow of compressible fluids
+    for HVAC and similar applications.
 
     Uses the flexible PIMPLE (PISO-SIMPLE) solution for time-resolved and
     pseudo-transient simulations.
@@ -49,16 +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 "createFieldRefs.H"
+    #include "createMRF.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.ref() = max
+    rDeltaT.dimensionedInternalField() = max
     (
         1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT),
-        fvc::surfaceSum(mag(phi))()()
-       /((2*maxCo)*mesh.V()*rho())
+        fvc::surfaceSum(mag(phi))().dimensionedInternalField()
+       /((2*maxCo)*mesh.V()*rho.dimensionedInternalField())
     );
 
     if (pimple.transonic())
@@ -41,11 +41,11 @@
             fvc::interpolate(psi)*fvc::flux(U)
         );
 
-        rDeltaT.ref() = max
+        rDeltaT.dimensionedInternalField() = max
         (
-            rDeltaT(),
-            fvc::surfaceSum(mag(phid))()()
-            /((2*maxCo)*mesh.V()*psi())
+            rDeltaT.dimensionedInternalField(),
+            fvc::surfaceSum(mag(phid))().dimensionedInternalField()
+            /((2*maxCo)*mesh.V()*psi.dimensionedInternalField())
         );
     }
 
@@ -53,8 +53,8 @@
     rDeltaT.correctBoundaryConditions();
 
     Info<< "Flow time scale min/max = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+        << gMin(1/rDeltaT.internalField())
+        << ", " << gMax(1/rDeltaT.internalField()) << endl;
 
     if (rDeltaTSmoothingCoeff < 1.0)
     {
@@ -62,8 +62,8 @@
     }
 
     Info<< "Smoothed flow time scale min/max = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+        << gMin(1/rDeltaT.internalField())
+        << ", " << gMax(1/rDeltaT.internalField()) << 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.primitiveField())
-            << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+            << gMin(1/rDeltaT.internalField())
+            << ", " << gMax(1/rDeltaT.internalField()) << endl;
     }
 }

applications/solvers/compressible/rhoSimpleFoam/createFieldRefs.H

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

applications/solvers/compressible/rhoSimpleFoam/createFields.H

@@ -1,9 +1,10 @@
 Info<< "Reading thermophysical properties\n" << endl;
-autoPtr<rhoThermo> pThermo
+
+autoPtr<psiThermo> pThermo
 (
-    rhoThermo::New(mesh)
+    psiThermo::New(mesh)
 );
-rhoThermo& thermo = pThermo();
+psiThermo& thermo = pThermo();
 thermo.validate(args.executable(), "h", "e");
 
 volScalarField rho
@@ -20,6 +21,7 @@ volScalarField rho
 );
 
 volScalarField& p = thermo.p();
+const volScalarField& psi = thermo.psi();
 
 Info<< "Reading field U\n" << endl;
 volVectorField U
@@ -79,5 +81,3 @@ autoPtr<compressible::turbulenceModel> turbulence
 );
 
 dimensionedScalar initialMass = fvc::domainIntegrate(rho);
-
-#include "createMRF.H"

applications/solvers/compressible/rhoSimpleFoam/pEqn.H

@@ -1,6 +1,4 @@
 {
-    //const volScalarField& psi = thermo.psi();
-
     volScalarField rAU(1.0/UEqn.A());
     surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
     volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
@@ -95,9 +93,6 @@
     rho = max(rho, rhoMin);
     rho = min(rho, rhoMax);
 
-    thermo.rho() = max(thermo.rho(), rhoMin);
-    thermo.rho() = min(thermo.rho(), rhoMax);
-
     if (!simple.transonic())
     {
         rho.relax();

applications/solvers/compressible/rhoSimpleFoam/pcEqn.H

@@ -109,8 +109,6 @@ if (closedVolume)
 rho = thermo.rho();
 rho = max(rho, rhoMin);
 rho = min(rho, rhoMax);
-thermo.rho() = max(thermo.rho(), rhoMin);
-thermo.rho() = min(thermo.rho(), rhoMax);
 
 if (!simple.transonic())
 {

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

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

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

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

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

@@ -86,10 +86,6 @@
     rho = thermo.rho();
     rho = max(rho, rhoMin);
     rho = min(rho, rhoMax);
-
-    thermo.rho() = max(thermo.rho(), rhoMin);
-    thermo.rho() = min(thermo.rho(), rhoMax);
-
     rho.relax();
     Info<< "rho max/min : "
         << max(rho).value() << " "

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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,9 @@ Group
     grpCompressibleSolvers
 
 Description
-    Steady-state solver for turbulent flow of compressible fluids, with
-    implicit or explicit porosity treatment and optional sources.
+    Steady-state solver for turbulent flow of compressible fluids with
+    RANS turbulence modelling, implicit or explicit porosity treatment
+    and run-time selectable finite volume sources.
 
 \*---------------------------------------------------------------------------*/
 
@@ -44,13 +45,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 "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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,12 +28,13 @@ Group
     grpCompressibleSolvers
 
 Description
-    Steady-state solver for turbulent flow of compressible fluids.
+    Steady-state SIMPLE solver for laminar or turbulent RANS flow of
+    compressible fluids.
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "rhoThermo.H"
+#include "psiThermo.H"
 #include "turbulentFluidThermoModel.H"
 #include "simpleControl.H"
 #include "fvOptions.H"
@@ -42,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"
+
+    simpleControl simple(mesh);
+
     #include "createFields.H"
-    #include "createFieldRefs.H"
+    #include "createMRF.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 

applications/solvers/compressible/sonicFoam/Make/options

@@ -1,4 +1,5 @@
 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

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

applications/solvers/compressible/sonicFoam/createFields.H

@@ -8,6 +8,8 @@ psiThermo& thermo = pThermo();
 thermo.validate(args.executable(), "e");
 
 volScalarField& p = thermo.p();
+volScalarField& e = thermo.he();
+const volScalarField& psi = thermo.psi();
 
 volScalarField rho
 (
@@ -52,5 +54,3 @@ 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,6 +2,7 @@ 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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,8 @@ Group
     grpCompressibleSolvers grpMovingMeshSolvers
 
 Description
-    Transient solver for trans-sonic/supersonic, turbulent flow of a
-    compressible gas, with optional mesh motion and mesh topology changes.
+    Transient solver for trans-sonic/supersonic, laminar or turbulent flow
+    of a compressible gas with mesh motion..
 
 \*---------------------------------------------------------------------------*/
 
@@ -45,20 +45,20 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "postProcess.H"
-
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "createControl.H"
+    #include "initContinuityErrs.H"
+
+    pimpleControl pimple(mesh);
+
     #include "createControls.H"
     #include "createFields.H"
-    #include "createFieldRefs.H"
+    #include "createMRF.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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,8 @@ Group
     grpCompressibleSolvers
 
 Description
-    Transient solver for trans-sonic/supersonic, turbulent flow of a
-    compressible gas.
+    Transient solver for trans-sonic/supersonic, laminar or turbulent flow
+    of a 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 "createFieldRefs.H"
+    #include "createMRF.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 

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

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

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

@@ -40,12 +40,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 "readThermodynamicProperties.H"
+    #include "readTransportProperties.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
 

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

@@ -1,2 +0,0 @@
-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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,8 @@ Group
     grpDiscreteMethodsSolvers
 
 Description
-    Direct simulation Monte Carlo (DSMC) solver for, transient, multi-species
-    flows.
+    Direct simulation Monte Carlo (DSMC) solver for 3D, transient, multi-
+    species 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-2016 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2011 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ Group
     grpDiscreteMethodsSolvers
 
 Description
-    Solver to equilibrate and/or precondition molecular dynamics systems.
+    Equilibrates and/or preconditions molecular dynamics systems
 
 \*---------------------------------------------------------------------------*/
 
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        if (runTime.writeTime())
+        if (runTime.outputTime())
         {
             nAveragingSteps = 0;
         }

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

@@ -1,17 +1,55 @@
-Info<< "\nReading field U\n" << endl;
-volVectorField U
-(
-    IOobject
+    Info<< "\nReading field U\n" << endl;
+    volVectorField U
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+    word polyatomicCloudName("polyatomicCloud");
+
+    potential polyPot
     (
-        "U",
-        runTime.timeName(),
         mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
+        IOdictionary
+        (
+            IOobject
+            (
+                polyatomicCloudName +  "Properties",
+                mesh.time().constant(),
+                mesh,
+                IOobject::MUST_READ_IF_MODIFIED,
+                IOobject::NO_WRITE,
+                false
+            )
+        )
+    );
 
-potential pot(mesh);
+    polyatomicCloud polyatomics(polyatomicCloudName, mesh, polyPot);
 
-moleculeCloud molecules(mesh, pot);
+    word monoatomicCloudName("monoatomicCloud");
+
+    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-2016 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2011 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -28,28 +28,41 @@ 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;
@@ -63,11 +76,12 @@ int main(int argc, char *argv[])
         molecules.evolve();
 
         #include "meanMomentumEnergyAndNMols.H"
+
         #include "temperatureAndPressure.H"
 
         runTime.write();
 
-        if (runTime.writeTime())
+        if (runTime.outputTime())
         {
             nAveragingSteps = 0;
         }

applications/solvers/electromagnetics/mhdFoam/createControl.H

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

applications/solvers/electromagnetics/mhdFoam/createPhiB.H

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

applications/solvers/electromagnetics/mhdFoam/mhdFoam.C

@@ -58,12 +58,14 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #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-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,10 +40,8 @@ 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"
@@ -74,7 +72,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        if (runTime.writeTime())
+        if (runTime.outputTime())
         {
             writeCellGraph(V, runTime.graphFormat());
             writeCellGraph(delta, runTime.graphFormat());