applications/solvers: Added -postProcess option

See also commit cc455173ff

applications/solvers/electromagnetics/mhdFoam/createControl.H

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

applications/solvers/electromagnetics/mhdFoam/createPhiB.H

@@ -1,17 +1,17 @@
-    IOobject phiBHeader
+IOobject phiBHeader
-    (
+(
     "phiB",
     runTime.timeName(),
     mesh,
     IOobject::NO_READ
-    );
+);
 
 
-    surfaceScalarField* phiBPtr;
+surfaceScalarField* phiBPtr = NULL;
 
-    if (phiBHeader.headerOk())
+if (phiBHeader.headerOk())
-    {
+{
-        Info<< "Reading field phiB\n" << endl;
+    Info<< "Reading face flux ";
 
     phiBPtr = new surfaceScalarField
     (
@@ -25,10 +25,10 @@
         ),
         mesh
     );
-    }
+}
-    else
+else
-    {
+{
-        Info<< "Calculating face flux\n" << endl;
+    Info<< "Calculating face flux ";
 
     phiBPtr = new surfaceScalarField
     (
@@ -42,6 +42,8 @@
         ),
         fvc::flux(B)
     );
-    }
+}
 
-    surfaceScalarField& phiB = *phiBPtr;
+surfaceScalarField& phiB = *phiBPtr;
+
+Info<< phiB.name() << nl << endl;

applications/solvers/electromagnetics/mhdFoam/mhdFoam.C

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

applications/solvers/financial/financialFoam/financialFoam.C

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

applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C

@@ -44,6 +44,7 @@ Description
 int main(int argc, char *argv[])
 {
     #include "postProcess.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"

applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createControls.H

@@ -1,3 +1,4 @@
+#include "createControl.H"
 #include "createTimeControls.H"
 
 bool correctPhi

applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C

@@ -50,12 +50,11 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
     #include "initContinuityErrs.H"
-    #include "createControl.H"
+    #include "createControls.H"
     #include "createFields.H"
     #include "createUf.H"
     #include "createMRF.H"
     #include "createFvOptions.H"
-    #include "createControls.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 

applications/solvers/incompressible/pisoFoam/createControl.H

@@ -1 +0,0 @@
-pisoControl piso(mesh);

applications/solvers/incompressible/shallowWaterFoam/createControl.H

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

applications/solvers/incompressible/simpleFoam/createControl.H

@@ -1 +0,0 @@
-simpleControl simple(mesh);

applications/solvers/multiphase/cavitatingFoam/createControl.H

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

applications/solvers/multiphase/compressibleInterFoam/createControl.H

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

applications/solvers/multiphase/compressibleMultiphaseInterFoam/createControl.H

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

applications/solvers/multiphase/driftFluxFoam/createControl.H

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

applications/solvers/multiphase/interFoam/createControl.H

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

applications/solvers/multiphase/interPhaseChangeFoam/createControl.H

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

applications/solvers/multiphase/multiphaseEulerFoam/createControl.H

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

applications/solvers/multiphase/potentialFreeSurfaceFoam/createControl.H

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

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

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

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

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

applications/solvers/multiphase/twoLiquidMixingFoam/createControl.H

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

applications/solvers/multiphase/twoPhaseEulerFoam/createControl.H

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

applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options

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

applications/solvers/stressAnalysis/solidDisplacementFoam/createControl.H

@@ -1,6 +1,3 @@
 const dictionary& stressControl = mesh.solutionDict().subDict("stressAnalysis");
 
-int nCorr = stressControl.lookupOrDefault<int>("nCorrectors", 1);
-
-scalar convergenceTolerance(readScalar(stressControl.lookup("D")));
 Switch compactNormalStress(stressControl.lookup("compactNormalStress"));

applications/solvers/stressAnalysis/solidDisplacementFoam/createControls.H

@@ -0,0 +1,5 @@
+#include "createControl.H"
+
+int nCorr = stressControl.lookupOrDefault<int>("nCorrectors", 1);
+
+scalar convergenceTolerance(readScalar(stressControl.lookup("D")));

applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H

@@ -1,3 +1,6 @@
+#include "readMechanicalProperties.H"
+#include "readThermalProperties.H"
+
 Info<< "Reading field D\n" << endl;
 volVectorField D
 (

applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.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,13 +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 "readMechanicalProperties.H"
+    #include "createControls.H"
-    #include "readThermalProperties.H"
-    #include "createSolidDisplacementFoamControls.H"
     #include "createFields.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I. \
     -I../solidDisplacementFoam \
     -ItractionDisplacementCorrectionStress \
     -I$(LIB_SRC)/finiteVolume/lnInclude \

applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/createControls.H

@@ -0,0 +1 @@
+const dictionary& stressControl = mesh.solutionDict().subDict("stressAnalysis");

applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/createFields.H

@@ -1,3 +1,5 @@
+#include "readMechanicalProperties.H"
+
 Info<< "Reading displacement field D\n" << endl;
 volVectorField D
 (

applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H

@@ -1,3 +1 @@
-const dictionary& stressControl = mesh.solutionDict().subDict("stressAnalysis");
-
 scalar accFac(readScalar(stressControl.lookup("accelerationFactor")));

applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.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,11 +42,13 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #define NO_CONTROL
+    #include "postProcess.H"
 
+    #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readMechanicalProperties.H"
+    #include "createControls.H"
     #include "createFields.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

@@ -39,15 +39,15 @@ Description
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifndef CREATE_MESH
-#define CREATE_MESH createMesh.H
+    #define CREATE_MESH createMesh.H
 #endif
 
 #ifndef CREATE_FIELDS
-#define CREATE_FIELDS createFields.H
+    #define CREATE_FIELDS createFields.H
 #endif
 
 #ifndef CREATE_CONTROL
-#define CREATE_CONTROL createControl.H
+    #define CREATE_CONTROL createControl.H
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,6 +55,8 @@ Description
 #define INCLUDE_FILE(X) INCLUDE_FILE2(X)
 #define INCLUDE_FILE2(X) #X
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 Foam::argList::addBoolOption
 (
     argList::postProcessOptionName,
@@ -71,7 +73,10 @@ if (argList::postProcess(argc, argv))
     #include "createTime.H"
     Foam::instantList timeDirs = Foam::timeSelector::select0(runTime, args);
     #include INCLUDE_FILE(CREATE_MESH)
+
+    #ifndef NO_CONTROL
     #include INCLUDE_FILE(CREATE_CONTROL)
+    #endif
 
     // Externally stored dictionary for functionObjectList
     // if not constructed from runTime

src/finiteVolume/cfdTools/general/solutionControl/createControl.H

@@ -0,0 +1,8 @@
+#if defined(NO_CONTROL)
+#elif defined(PISO_CONTROL)
+    #include "createPisoControl.H"
+#elif defined(PIMPLE_CONTROL)
+    #include "createPimpleControl.H"
+#elif defined(SIMPLE_CONTROL)
+    #include "createSimpleControl.H"
+#endif

src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,6 +38,9 @@ Description
 
 #include "solutionControl.H"
 
+//- Declare that pimpleControl will be used
+#define PIMPLE_CONTROL
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam

src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H

@@ -34,6 +34,10 @@ Description
 
 #include "pimpleControl.H"
 
+//- Declare that pisoControl will be used
+#define PISO_CONTROL
+#undef PIMPLE_CONTROL
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam

src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H

@@ -35,6 +35,9 @@ Description
 
 #include "solutionControl.H"
 
+//- Declare that pimpleControl will be used
+#define SIMPLE_CONTROL
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam