applications/solvers/combustion: Added -postProcess option

See also commit 30e2f912e5

applications/solvers/combustion/PDRFoam/PDRFoam.C

@@ -83,17 +83,16 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "readCombustionProperties.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"

applications/solvers/combustion/PDRFoam/createFieldRefs.H

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

applications/solvers/combustion/PDRFoam/createFields.H

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

applications/solvers/combustion/XiFoam/XiFoam.C

@@ -62,16 +62,15 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "readCombustionProperties.H"
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"

applications/solvers/combustion/XiFoam/createFieldRefs.H

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

applications/solvers/combustion/XiFoam/createFields.H

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

applications/solvers/combustion/chemFoam/chemFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,10 +48,15 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
 
+    #define CREATE_MESH createSingleCellMesh.H
+    #define NO_CONTROL
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createSingleCellMesh.H"
     #include "createFields.H"
+    #include "createFieldRefs.H"
     #include "readInitialConditions.H"
     #include "createControls.H"
 

applications/solvers/combustion/chemFoam/createFieldRefs.H

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

applications/solvers/combustion/chemFoam/createFields.H

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

applications/solvers/combustion/coldEngineFoam/Make/options

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

applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C

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

applications/solvers/combustion/coldEngineFoam/createFieldRefs.H

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

applications/solvers/combustion/coldEngineFoam/createFields.H

@@ -21,9 +21,6 @@
     );
 
     volScalarField& p = thermo.p();
-    const volScalarField& psi = thermo.psi();
-    const volScalarField& T = thermo.T();
-
 
     Info<< "\nReading field U\n" << endl;
     volVectorField 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-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,16 +65,17 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #define CREATE_TIME createEngineTime.H
+    #define CREATE_MESH createEngineMesh.H
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createEngineTime.H"
     #include "createEngineMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "readCombustionProperties.H"
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
     #include "createRhoUf.H"
     #include "initContinuityErrs.H"

applications/solvers/combustion/fireFoam/createFieldRefs.H

@@ -0,0 +1,3 @@
+const volScalarField& psi = thermo.psi();
+const volScalarField& T = thermo.T();
+filmModelType& surfaceFilm = tsurfaceFilm();

applications/solvers/combustion/fireFoam/createFields.H

@@ -35,8 +35,6 @@ volScalarField rho
 );
 
 volScalarField& p = thermo.p();
-const volScalarField& T = thermo.T();
-const volScalarField& psi = thermo.psi();
 
 Info<< "\nReading field U\n" << endl;
 volVectorField U
@@ -156,3 +154,8 @@ 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"

applications/solvers/combustion/fireFoam/createSurfaceFilmModel.H

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

applications/solvers/combustion/fireFoam/fireFoam.C

@@ -46,19 +46,15 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "createFields.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
-    #include "createClouds.H"
-    #include "createSurfaceFilmModel.H"
-    #include "createPyrolysisModel.H"
-    #include "createRadiationModel.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/combustion/reactingFoam/createFieldRefs.H

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

applications/solvers/combustion/reactingFoam/createFields.H

@@ -40,8 +40,6 @@ volVectorField U
 
 
 volScalarField& p = thermo.p();
-const volScalarField& psi = thermo.psi();
-const volScalarField& T = thermo.T();
 
 #include "compressibleCreatePhi.H"
 
@@ -123,3 +121,5 @@ volScalarField dQ
     mesh,
     dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
 );
+
+#include "createMRF.H"

applications/solvers/combustion/reactingFoam/reactingFoam.C

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

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

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

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

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

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

@@ -40,8 +40,6 @@ volVectorField U
 
 
 volScalarField& p = thermo.p();
-const volScalarField& psi = thermo.psi();
-const volScalarField& T = thermo.T();
 
 
 #include "compressibleCreatePhi.H"
@@ -123,3 +121,5 @@ volScalarField dQ
     mesh,
     dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
 );
+
+#include "createMRF.H"

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

@@ -43,17 +43,17 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "createTimeControls.H"
     #include "createRDeltaT.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
-    #include "createMRF.H"
+    #include "createFieldRefs.H"
     #include "createFvOptions.H"
 
     turbulence->validate();

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

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

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

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

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

@@ -40,8 +40,6 @@ volVectorField U
 
 
 volScalarField& p = thermo.p();
-const volScalarField& psi = thermo.psi();
-const volScalarField& T = thermo.T();
 
 #include "compressibleCreatePhi.H"
 
@@ -102,3 +100,5 @@ volScalarField dQ
     mesh,
     dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
 );
+
+#include "createMRF.H"

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

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

src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H

@@ -38,6 +38,10 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifndef CREATE_TIME
+    #define CREATE_TIME createTime.H
+#endif
+
 #ifndef CREATE_MESH
     #define CREATE_MESH createMesh.H
 #endif
@@ -70,7 +74,7 @@ if (argList::postProcess(argc, argv))
     #include "addDictOption.H"
 
     #include "setRootCase.H"
-    #include "createTime.H"
+    #include INCLUDE_FILE(CREATE_TIME)
     Foam::instantList timeDirs = Foam::timeSelector::select0(runTime, args);
     #include INCLUDE_FILE(CREATE_MESH)