diff --git a/applications/solvers/electromagnetics/mhdFoam/createControl.H b/applications/solvers/electromagnetics/mhdFoam/createControl.H
new file mode 100644
index 0000000000000000000000000000000000000000..34f65a9eae9bef4d488729ece7d8d92c59c1bd85
--- /dev/null
+++ b/applications/solvers/electromagnetics/mhdFoam/createControl.H
@@ -0,0 +1,2 @@
+pisoControl piso(mesh);
+pisoControl bpiso(mesh, "BPISO");
diff --git a/applications/solvers/electromagnetics/mhdFoam/createPhiB.H b/applications/solvers/electromagnetics/mhdFoam/createPhiB.H
index de0c573259c80f9d301b22dd316b242a05055d19..f79a80b827059b37130b626ef9281a5c04b6779c 100644
--- a/applications/solvers/electromagnetics/mhdFoam/createPhiB.H
+++ b/applications/solvers/electromagnetics/mhdFoam/createPhiB.H
@@ -1,47 +1,49 @@
- IOobject phiBHeader
- (
- "phiB",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ
- );
+IOobject phiBHeader
+(
+ "phiB",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ
+);
- surfaceScalarField* phiBPtr;
+surfaceScalarField* phiBPtr = NULL;
- if (phiBHeader.headerOk())
- {
- Info<< "Reading field phiB\n" << endl;
+if (phiBHeader.headerOk())
+{
+ Info<< "Reading face flux ";
- phiBPtr = new surfaceScalarField
+ phiBPtr = new surfaceScalarField
+ (
+ IOobject
(
- IOobject
- (
- "phiB",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
- }
- else
- {
- Info<< "Calculating face flux\n" << endl;
+ "phiB",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ );
+}
+else
+{
+ Info<< "Calculating face flux ";
- phiBPtr = new surfaceScalarField
+ phiBPtr = new surfaceScalarField
+ (
+ IOobject
(
- IOobject
- (
- "phiB",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- fvc::flux(B)
- );
- }
+ "phiB",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ fvc::flux(B)
+ );
+}
+
+surfaceScalarField& phiB = *phiBPtr;
- surfaceScalarField& phiB = *phiBPtr;
+Info<< phiB.name() << nl << endl;
diff --git a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
index 43e800b48b755783175d90fe083bd7ff3bf4fee1..c1c75d94d5c6b785b20d9d3843bc65f88d03024f 100644
--- a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
+++ b/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"
-
- pisoControl piso(mesh);
- pisoControl bpiso(mesh, "BPISO");
-
+ #include "createControl.H"
#include "createFields.H"
#include "initContinuityErrs.H"
diff --git a/applications/solvers/financial/financialFoam/financialFoam.C b/applications/solvers/financial/financialFoam/financialFoam.C
index 16640d7ce7ed614dff3c54fa757e66facc89ac2c..c146b13cb44acbecfc84fb5d1e765ab62c805f29 100644
--- a/applications/solvers/financial/financialFoam/financialFoam.C
+++ b/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"
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
index d1b8bc197623077bbc6bcd5ff971e6e6e9defe4a..526ffb1ca430fbc05beecf71c0c9047b505aa613 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
+++ b/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"
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createControls.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createControls.H
index ca5e25906b35020fef163083592443d2fd04358f..bee8bd4f39ebd2444f37099dc020828c6cc756fc 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createControls.H
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createControls.H
@@ -1,3 +1,4 @@
+#include "createControl.H"
#include "createTimeControls.H"
bool correctPhi
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
index 23bc0e0618c94dea1d2f5bd99e159a3ba128c8a3..d30bbaa67b55b346faeebd8542e4a1d1a86c3f94 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/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"
diff --git a/applications/solvers/incompressible/pisoFoam/createControl.H b/applications/solvers/incompressible/pisoFoam/createControl.H
deleted file mode 100644
index a721b7405299b9aedf7c6b7b16ed39b907543c9f..0000000000000000000000000000000000000000
--- a/applications/solvers/incompressible/pisoFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-pisoControl piso(mesh);
diff --git a/applications/solvers/incompressible/shallowWaterFoam/createControl.H b/applications/solvers/incompressible/shallowWaterFoam/createControl.H
deleted file mode 100644
index cf82a59b358b7aaa3981f923a5610f2c0985b9b0..0000000000000000000000000000000000000000
--- a/applications/solvers/incompressible/shallowWaterFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-pimpleControl pimple(mesh);
diff --git a/applications/solvers/incompressible/simpleFoam/createControl.H b/applications/solvers/incompressible/simpleFoam/createControl.H
deleted file mode 100644
index 36ebed126c001d3de228d53d59d32fec338a5071..0000000000000000000000000000000000000000
--- a/applications/solvers/incompressible/simpleFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-simpleControl simple(mesh);
diff --git a/applications/solvers/multiphase/cavitatingFoam/createControl.H b/applications/solvers/multiphase/cavitatingFoam/createControl.H
deleted file mode 100644
index cf82a59b358b7aaa3981f923a5610f2c0985b9b0..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/cavitatingFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-pimpleControl pimple(mesh);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/createControl.H b/applications/solvers/multiphase/compressibleInterFoam/createControl.H
deleted file mode 100644
index cf82a59b358b7aaa3981f923a5610f2c0985b9b0..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/compressibleInterFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-pimpleControl pimple(mesh);
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createControl.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createControl.H
deleted file mode 100644
index cf82a59b358b7aaa3981f923a5610f2c0985b9b0..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-pimpleControl pimple(mesh);
diff --git a/applications/solvers/multiphase/driftFluxFoam/createControl.H b/applications/solvers/multiphase/driftFluxFoam/createControl.H
deleted file mode 100644
index cf82a59b358b7aaa3981f923a5610f2c0985b9b0..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/driftFluxFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-pimpleControl pimple(mesh);
diff --git a/applications/solvers/multiphase/interFoam/createControl.H b/applications/solvers/multiphase/interFoam/createControl.H
deleted file mode 100644
index cf82a59b358b7aaa3981f923a5610f2c0985b9b0..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/interFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-pimpleControl pimple(mesh);
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/createControl.H b/applications/solvers/multiphase/interPhaseChangeFoam/createControl.H
deleted file mode 100644
index cf82a59b358b7aaa3981f923a5610f2c0985b9b0..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/interPhaseChangeFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-pimpleControl pimple(mesh);
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/createControl.H b/applications/solvers/multiphase/multiphaseEulerFoam/createControl.H
deleted file mode 100644
index cf82a59b358b7aaa3981f923a5610f2c0985b9b0..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/multiphaseEulerFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-pimpleControl pimple(mesh);
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createControl.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/createControl.H
deleted file mode 100644
index cf82a59b358b7aaa3981f923a5610f2c0985b9b0..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-pimpleControl pimple(mesh);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createControl.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createControl.H
deleted file mode 100644
index cf82a59b358b7aaa3981f923a5610f2c0985b9b0..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-pimpleControl pimple(mesh);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createControl.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createControl.H
deleted file mode 100644
index cf82a59b358b7aaa3981f923a5610f2c0985b9b0..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-pimpleControl pimple(mesh);
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/createControl.H b/applications/solvers/multiphase/twoLiquidMixingFoam/createControl.H
deleted file mode 100644
index cf82a59b358b7aaa3981f923a5610f2c0985b9b0..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-pimpleControl pimple(mesh);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createControl.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createControl.H
deleted file mode 100644
index cf82a59b358b7aaa3981f923a5610f2c0985b9b0..0000000000000000000000000000000000000000
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/createControl.H
+++ /dev/null
@@ -1 +0,0 @@
-pimpleControl pimple(mesh);
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options b/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options
index cb550fefd655811d6d709ba5f32e6007cf3895de..28d26a7fd1fde2f5e508f929991a51838803383a 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options
+++ b/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
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/createSolidDisplacementFoamControls.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/createControl.H
similarity index 53%
rename from applications/solvers/stressAnalysis/solidDisplacementFoam/createSolidDisplacementFoamControls.H
rename to applications/solvers/stressAnalysis/solidDisplacementFoam/createControl.H
index a01c72dfa962859ce339f0fab938682843c3994a..edd35297d52bc9c2261301c61f0e0c49095edae2 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/createSolidDisplacementFoamControls.H
+++ b/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"));
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/createControls.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/createControls.H
new file mode 100644
index 0000000000000000000000000000000000000000..dec25226f115e1660d8d364dffb3371de219fafc
--- /dev/null
+++ b/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")));
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H
index 004cda17327f632f952e8484997b5a342f6ac49c..ffaada38796177f30004d80db17f6d45e1410e59 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H
@@ -1,3 +1,6 @@
+#include "readMechanicalProperties.H"
+#include "readThermalProperties.H"
+
Info<< "Reading field D\n" << endl;
volVectorField D
(
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
index f79242dcf03b8947c9133160f4ff543fe1b2cefe..3dddea7d4d8dc11a0332087a84b9fecd092540de 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
+++ b/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 "readThermalProperties.H"
- #include "createSolidDisplacementFoamControls.H"
+ #include "createControls.H"
#include "createFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/Make/options b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/Make/options
index 2393d0bd6f88c09c5e7ed9f59621ee50ed80accc..5201a0cd111909677b4fc36623d9992d41de91bc 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/Make/options
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/Make/options
@@ -1,4 +1,5 @@
EXE_INC = \
+ -I. \
-I../solidDisplacementFoam \
-ItractionDisplacementCorrectionStress \
-I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/createControls.H b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/createControls.H
new file mode 100644
index 0000000000000000000000000000000000000000..95d74370cc8b3da65fa219a56e6a4bc883040c5a
--- /dev/null
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/createControls.H
@@ -0,0 +1 @@
+const dictionary& stressControl = mesh.solutionDict().subDict("stressAnalysis");
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/createFields.H b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/createFields.H
index cff3ae2b368dec5ec95d2e18c3af2af6d565994e..cdde961ab83f6ed8cdfeaeb9645ef32b99f95418 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/createFields.H
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/createFields.H
@@ -1,3 +1,5 @@
+#include "readMechanicalProperties.H"
+
Info<< "Reading displacement field D\n" << endl;
volVectorField D
(
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H
index fb75502946ad35dd7529ba3c131fe7da78e07cbd..dd7af1704a58d00621b49b33fa3e0975ee6eab05 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H
@@ -1,3 +1 @@
-const dictionary& stressControl = mesh.solutionDict().subDict("stressAnalysis");
-
scalar accFac(readScalar(stressControl.lookup("accelerationFactor")));
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
index 240593d81468da18b81068caccbb9e1dca0f0d05..93c1c0de4b567d569cf50f02f7426482cfbcfeb7 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
+++ b/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"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H b/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H
index 2a16ae115a2e82311343591729ce0b5db597e3e9..20b7abfac7655efe72e0728ddf02a7448104d74e 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H
+++ b/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
diff --git a/applications/solvers/incompressible/pimpleFoam/createControl.H b/src/finiteVolume/cfdTools/general/include/createPimpleControl.H
similarity index 100%
rename from applications/solvers/incompressible/pimpleFoam/createControl.H
rename to src/finiteVolume/cfdTools/general/include/createPimpleControl.H
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/createControl.H b/src/finiteVolume/cfdTools/general/include/createPisoControl.H
similarity index 100%
rename from applications/solvers/incompressible/nonNewtonianIcoFoam/createControl.H
rename to src/finiteVolume/cfdTools/general/include/createPisoControl.H
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createControl.H b/src/finiteVolume/cfdTools/general/include/createSimpleControl.H
similarity index 100%
rename from applications/solvers/incompressible/adjointShapeOptimizationFoam/createControl.H
rename to src/finiteVolume/cfdTools/general/include/createSimpleControl.H
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/createControl.H b/src/finiteVolume/cfdTools/general/solutionControl/createControl.H
new file mode 100644
index 0000000000000000000000000000000000000000..7d06285a1b7d57ffb5b9e5049283d29a7cf8a6d0
--- /dev/null
+++ b/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
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
index 1d78752b33f87cff2e437cd83d7baa85229dc0c6..b1ff49b6868985d694d0a833eb35a4dfc1b25d64 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
+++ b/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
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H
index 9b5a85de74efe4fdc7cf553749eb3adcfa290326..eede038374f069b07e2f267f8859a6be4df3f699 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H
+++ b/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
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
index a9b3b5b49b620395b183b36f23291d51378c6a1a..8a44079a5c7d5c2fc28964502206b7e4f52f8b22 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
+++ b/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