applications/solvers/multiphase: Added -postProcess option

See also commit 30e2f912e5

applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C

@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "createControls.H"
+    #include "createControl.H"
     #include "createFields.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"

applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C

@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "createControls.H"
+    #include "createControl.H"
     #include "createFields.H"
     #include "createPorousZones.H"
     #include "createFvOptions.H"

applications/solvers/incompressible/simpleFoam/simpleFoam.C

@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "createControls.H"
+    #include "createControl.H"
     #include "createFields.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"

applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,12 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
-    #include "readThermodynamicProperties.H"
     #include "createControls.H"
     #include "createFields.H"
     #include "createUf.H"

applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.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,12 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
-    #include "readThermodynamicProperties.H"
     #include "createControls.H"
     #include "createFields.H"
     #include "CourantNo.H"

applications/solvers/multiphase/cavitatingFoam/createFields.H

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

applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C

@@ -52,19 +52,24 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
     #include "initContinuityErrs.H"
-
+    #include "createControl.H"
-    pimpleControl pimple(mesh);
-
     #include "createFields.H"
     #include "createUf.H"
     #include "createControls.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    volScalarField& p = mixture.p();
+    volScalarField& T = mixture.T();
+    const volScalarField& psi1 = mixture.thermo1().psi();
+    const volScalarField& psi2 = mixture.thermo2().psi();
+
     turbulence->validate();
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C

@@ -49,17 +49,22 @@ 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 "createFields.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    volScalarField& p = mixture.p();
+    volScalarField& T = mixture.T();
+    const volScalarField& psi1 = mixture.thermo1().psi();
+    const volScalarField& psi2 = mixture.thermo2().psi();
+
     turbulence->validate();
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/multiphase/compressibleInterFoam/createFields.H

@@ -36,12 +36,8 @@ volScalarField& alpha2(mixture.alpha2());
 
 Info<< "Reading thermophysical properties\n" << endl;
 
-volScalarField& p = mixture.p();
-volScalarField& T = mixture.T();
 volScalarField& rho1 = mixture.thermo1().rho();
-const volScalarField& psi1 = mixture.thermo1().psi();
 volScalarField& rho2 = mixture.thermo2().rho();
-const volScalarField& psi2 = mixture.thermo2().psi();
 
 volScalarField rho
 (

applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options

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

applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C

@@ -44,17 +44,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 "createTimeControls.H"
     #include "createFields.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    volScalarField& p = mixture.p();
+    volScalarField& T = mixture.T();
+
     turbulence->validate();
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H

@@ -31,9 +31,6 @@ volVectorField U
 Info<< "Constructing multiphaseMixtureThermo\n" << endl;
 multiphaseMixtureThermo mixture(U, phi);
 
-volScalarField& p = mixture.p();
-volScalarField& T = mixture.T();
-
 volScalarField rho
 (
     IOobject

applications/solvers/multiphase/driftFluxFoam/createControl.H

@@ -0,0 +1 @@
+pimpleControl pimple(mesh);

applications/solvers/multiphase/driftFluxFoam/createFields.H

@@ -33,10 +33,6 @@ Info<< "Reading incompressibleTwoPhaseInteractingMixture\n" << endl;
 incompressibleTwoPhaseInteractingMixture mixture(U, phi);
 
 volScalarField& alpha1(mixture.alpha1());
-volScalarField& alpha2(mixture.alpha2());
-
-const dimensionedScalar& rho1 = mixture.rhod();
-const dimensionedScalar& rho2 = mixture.rhoc();
 
 // Mixture density
 volScalarField rho
@@ -77,8 +73,6 @@ autoPtr<relativeVelocityModel> UdmModelPtr
     )
 );
 
-relativeVelocityModel& UdmModel(UdmModelPtr());
-
 
 // Construct compressible turbulence model
 autoPtr

applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C

@@ -49,19 +49,23 @@ 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 "createTimeControls.H"
     #include "createFields.H"
     #include "createMRF.H"
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
+    volScalarField& alpha2(mixture.alpha2());
+    const dimensionedScalar& rho1 = mixture.rhod();
+    const dimensionedScalar& rho2 = mixture.rhoc();
+    relativeVelocityModel& UdmModel(UdmModelPtr());
+
     turbulence->validate();
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/multiphase/interFoam/createControl.H

@@ -0,0 +1 @@
+pimpleControl pimple(mesh);

applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C

@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
     #include "initContinuityErrs.H"
-    #include "createControls.H"
+    #include "createControl.H"
     #include "createTimeControls.H"
     #include "createDyMControls.H"
     #include "createRDeltaT.H"

applications/solvers/multiphase/interFoam/interFoam.C

@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "createControls.H"
+    #include "createControl.H"
     #include "createTimeControls.H"
     #include "createRDeltaT.H"
     #include "initContinuityErrs.H"

applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C

@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "createControls.H"
+    #include "createControl.H"
     #include "createTimeControls.H"
     #include "createRDeltaT.H"
     #include "initContinuityErrs.H"

applications/solvers/multiphase/interPhaseChangeFoam/createControl.H

@@ -0,0 +1 @@
+pimpleControl pimple(mesh);

applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C

@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "createControls.H"
+    #include "createControl.H"
     #include "createTimeControls.H"
     #include "../interFoam/interDyMFoam/createDyMControls.H"
     #include "initContinuityErrs.H"

applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C

@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "createControls.H"
+    #include "createControl.H"
     #include "createFields.H"
     #include "createFvOptions.H"
     #include "createTimeControls.H"

applications/solvers/multiphase/multiphaseEulerFoam/createControl.H

@@ -0,0 +1 @@
+pimpleControl pimple(mesh);

applications/solvers/multiphase/multiphaseEulerFoam/createFields.H

@@ -51,18 +51,6 @@ forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
     phi += fvc::interpolate(alpha)*phase.phi();
 }
 
-scalar slamDampCoeff
-(
-    fluid.lookupOrDefault<scalar>("slamDampCoeff", 1)
-);
-
-dimensionedScalar maxSlamVelocity
-(
-    "maxSlamVelocity",
-    dimVelocity,
-    fluid.lookupOrDefault<scalar>("maxSlamVelocity", GREAT)
-);
-
 
 volScalarField rho
 (
@@ -114,3 +102,6 @@ setRefCell
     pRefValue
 );
 mesh.setFluxRequired(p_rgh.name());
+
+
+#include "createMRFZones.H"

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C

@@ -45,21 +45,31 @@ 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 "createMRFZones.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"
     #include "correctPhi.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    scalar slamDampCoeff
+    (
+        fluid.lookupOrDefault<scalar>("slamDampCoeff", 1)
+    );
+
+    dimensionedScalar maxSlamVelocity
+    (
+        "maxSlamVelocity",
+        dimVelocity,
+        fluid.lookupOrDefault<scalar>("maxSlamVelocity", GREAT)
+    );
+
     turbulence->validate();
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C

@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
     #include "initContinuityErrs.H"
-    #include "createControls.H"
+    #include "createControl.H"
     #include "createTimeControls.H"
     #include "createDyMControls.H"
     #include "createFields.H"

applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C

@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "createControls.H"
+    #include "createControl.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "createMRF.H"

applications/solvers/multiphase/potentialFreeSurfaceFoam/createControl.H

@@ -0,0 +1 @@
+pimpleControl pimple(mesh);

applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C

@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
     #include "initContinuityErrs.H"
-    #include "createControls.H"
+    #include "createControl.H"
     #include "createTimeControls.H"
     #include "createDyMControls.H"
     #include "createFields.H"

applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C

@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "createControls.H"
+    #include "createControl.H"
     #include "createTimeControls.H"
     #include "createFields.H"
     #include "createMRF.H"

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createControl.H

@@ -0,0 +1 @@
+pimpleControl pimple(mesh);

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFieldRefs.H

@@ -0,0 +1,4 @@
+surfaceScalarField& phi = fluid.phi();
+
+const IOMRFZoneList& MRF = fluid.MRF();
+fv::options& fvOptions = fluid.fvOptions();

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H

@@ -10,8 +10,6 @@ autoPtr<multiphaseSystem> fluidPtr
 multiphaseSystem& fluid = fluidPtr();
 multiphaseSystem::phaseModelList& phases = fluid.phases();
 
-surfaceScalarField& phi = fluid.phi();
-
 dimensionedScalar pMin
 (
     "pMin",
@@ -48,6 +46,3 @@ setRefCell
     pRefValue
 );
 mesh.setFluxRequired(p_rgh.name());
-
-const IOMRFZoneList& MRF = fluid.MRF();
-fv::options& fvOptions = fluid.fvOptions();

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C

@@ -43,16 +43,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 "createTimeControls.H"
     #include "createRDeltaT.H"
     #include "createFields.H"
+    #include "createFieldRefs.H"
 
     if (!LTS)
     {

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createControl.H

@@ -0,0 +1 @@
+pimpleControl pimple(mesh);

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFieldRefs.H

@@ -0,0 +1,28 @@
+phaseModel& phase1 = fluid.phase1();
+phaseModel& phase2 = fluid.phase2();
+
+volScalarField& alpha1 = phase1;
+volScalarField& alpha2 = phase2;
+
+volVectorField& U1 = phase1.U();
+surfaceScalarField& phi1 = phase1.phi();
+surfaceScalarField& alphaPhi1 = phase1.alphaPhi();
+surfaceScalarField& alphaRhoPhi1 = phase1.alphaRhoPhi();
+
+volVectorField& U2 = phase2.U();
+surfaceScalarField& phi2 = phase2.phi();
+surfaceScalarField& alphaPhi2 = phase2.alphaPhi();
+surfaceScalarField& alphaRhoPhi2 = phase2.alphaRhoPhi();
+surfaceScalarField& phi = fluid.phi();
+
+rhoThermo& thermo1 = phase1.thermo();
+rhoThermo& thermo2 = phase2.thermo();
+
+volScalarField& rho1 = thermo1.rho();
+const volScalarField& psi1 = thermo1.psi();
+
+volScalarField& rho2 = thermo2.rho();
+const volScalarField& psi2 = thermo2.psi();
+
+const IOMRFZoneList& MRF = fluid.MRF();
+fv::options& fvOptions = fluid.fvOptions();

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H

@@ -9,24 +9,6 @@ autoPtr<twoPhaseSystem> fluidPtr
 );
 twoPhaseSystem& fluid = fluidPtr();
 
-phaseModel& phase1 = fluid.phase1();
-phaseModel& phase2 = fluid.phase2();
-
-volScalarField& alpha1 = phase1;
-volScalarField& alpha2 = phase2;
-
-volVectorField& U1 = phase1.U();
-surfaceScalarField& phi1 = phase1.phi();
-surfaceScalarField& alphaPhi1 = phase1.alphaPhi();
-surfaceScalarField& alphaRhoPhi1 = phase1.alphaRhoPhi();
-
-volVectorField& U2 = phase2.U();
-surfaceScalarField& phi2 = phase2.phi();
-surfaceScalarField& alphaPhi2 = phase2.alphaPhi();
-surfaceScalarField& alphaRhoPhi2 = phase2.alphaRhoPhi();
-
-surfaceScalarField& phi = fluid.phi();
-
 dimensionedScalar pMin
 (
     "pMin",
@@ -36,16 +18,7 @@ dimensionedScalar pMin
 
 #include "gh.H"
 
-rhoThermo& thermo1 = phase1.thermo();
+volScalarField& p = fluid.phase1().thermo().p();
-rhoThermo& thermo2 = phase2.thermo();
-
-volScalarField& p = thermo1.p();
-
-volScalarField& rho1 = thermo1.rho();
-const volScalarField& psi1 = thermo1.psi();
-
-volScalarField& rho2 = thermo2.rho();
-const volScalarField& psi2 = thermo2.psi();
 
 Info<< "Reading field p_rgh\n" << endl;
 volScalarField p_rgh
@@ -72,6 +45,3 @@ setRefCell
     pRefValue
 );
 mesh.setFluxRequired(p_rgh.name());
-
-const IOMRFZoneList& MRF = fluid.MRF();
-fv::options& fvOptions = fluid.fvOptions();

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C

@@ -44,16 +44,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 "createTimeControls.H"
     #include "createRDeltaT.H"
     #include "createFields.H"
+    #include "createFieldRefs.H"
 
     if (!LTS)
     {

applications/solvers/multiphase/twoLiquidMixingFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I../interFoam \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels \

applications/solvers/multiphase/twoLiquidMixingFoam/createControl.H

@@ -0,0 +1 @@
+pimpleControl pimple(mesh);

applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C

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

applications/solvers/multiphase/twoPhaseEulerFoam/createControl.H

@@ -0,0 +1 @@
+pimpleControl pimple(mesh);

applications/solvers/multiphase/twoPhaseEulerFoam/createFieldRefs.H

@@ -0,0 +1,20 @@
+volScalarField& alpha2 = phase2;
+
+surfaceScalarField& phi1 = phase1.phi();
+surfaceScalarField& alphaPhi1 = phase1.alphaPhi();
+surfaceScalarField& alphaRhoPhi1 = phase1.alphaRhoPhi();
+
+surfaceScalarField& phi2 = phase2.phi();
+surfaceScalarField& alphaPhi2 = phase2.alphaPhi();
+surfaceScalarField& alphaRhoPhi2 = phase2.alphaRhoPhi();
+
+surfaceScalarField& phi = fluid.phi();
+
+rhoThermo& thermo1 = phase1.thermo();
+rhoThermo& thermo2 = phase2.thermo();
+
+volScalarField& rho1 = thermo1.rho();
+const volScalarField& psi1 = thermo1.psi();
+
+volScalarField& rho2 = thermo2.rho();
+const volScalarField& psi2 = thermo2.psi();

applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H

@@ -9,19 +9,10 @@ phaseModel& phase1 = fluid.phase1();
 phaseModel& phase2 = fluid.phase2();
 
 volScalarField& alpha1 = phase1;
-volScalarField& alpha2 = phase2;
-
 volVectorField& U1 = phase1.U();
-surfaceScalarField& phi1 = phase1.phi();
-surfaceScalarField& alphaPhi1 = phase1.alphaPhi();
-surfaceScalarField& alphaRhoPhi1 = phase1.alphaRhoPhi();
-
 volVectorField& U2 = phase2.U();
-surfaceScalarField& phi2 = phase2.phi();
-surfaceScalarField& alphaPhi2 = phase2.alphaPhi();
-surfaceScalarField& alphaRhoPhi2 = phase2.alphaRhoPhi();
 
-surfaceScalarField& phi = fluid.phi();
+volScalarField& p = phase1.thermo().p();
 
 dimensionedScalar pMin
 (
@@ -32,17 +23,6 @@ dimensionedScalar pMin
 
 #include "gh.H"
 
-rhoThermo& thermo1 = phase1.thermo();
-rhoThermo& thermo2 = phase2.thermo();
-
-volScalarField& p = thermo1.p();
-
-volScalarField& rho1 = thermo1.rho();
-const volScalarField& psi1 = thermo1.psi();
-
-volScalarField& rho2 = thermo2.rho();
-const volScalarField& psi2 = thermo2.psi();
-
 Info<< "Reading field p_rgh\n" << endl;
 volScalarField p_rgh
 (
@@ -100,3 +80,5 @@ volScalarField dpdt
 Info<< "Creating field kinetic energy K\n" << endl;
 volScalarField K1(IOobject::groupName("K", phase1.name()), 0.5*magSqr(U1));
 volScalarField K2(IOobject::groupName("K", phase2.name()), 0.5*magSqr(U2));
+
+#include "createMRF.H"

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C

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

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

@@ -42,12 +42,12 @@ Description
 #define CREATE_MESH createMesh.H
 #endif
 
-#ifndef CREATE_FIELDS_1
+#ifndef CREATE_FIELDS
-#define CREATE_FIELDS_1 createFields.H
+#define CREATE_FIELDS createFields.H
 #endif
 
-#ifndef CREATE_CONTROLS
+#ifndef CREATE_CONTROL
-#define CREATE_CONTROLS createControls.H
+#define CREATE_CONTROL createControl.H
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -71,7 +71,7 @@ if (argList::postProcess(argc, argv))
     #include "createTime.H"
     Foam::instantList timeDirs = Foam::timeSelector::select0(runTime, args);
     #include INCLUDE_FILE(CREATE_MESH)
-    #include INCLUDE_FILE(CREATE_CONTROLS)
+    #include INCLUDE_FILE(CREATE_CONTROL)
 
     // Externally stored dictionary for functionObjectList
     // if not constructed from runTime
@@ -96,7 +96,7 @@ if (argList::postProcess(argc, argv))
                 functionObjectList::New(args, runTime, functionObjectsDict);
         }
 
-        #include INCLUDE_FILE(CREATE_FIELDS_1)
+        #include INCLUDE_FILE(CREATE_FIELDS)
 
         #ifdef CREATE_FIELDS_2
         #include INCLUDE_FILE(CREATE_FIELDS_2)
@@ -132,7 +132,7 @@ if (argList::postProcess(argc, argv))
 #undef INCLUDE_FILE2
 
 #undef CREATE_MESH
-#undef CREATE_FIELDS_1
+#undef CREATE_FIELDS
-#undef CREATE_CONTROLS
+#undef CREATE_CONTROL
 
 // ************************************************************************* //