Modified to work with backported createTimeControl.H from OF 3.0.1

2016-05-06 23:31:48 +02:00 · 2016-05-06 23:31:48 +02:00 · 1e8bd24dc7
commit 1e8bd24dc7
parent 36b4fa3811
67 changed files with 179 additions and 74 deletions
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@ -77,7 +77,7 @@ int main(int argc, char *argv[])
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"

--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@ -80,7 +80,7 @@ int main(int argc, char *argv[])
 #   include "createFields.H"
 #   include "readPISOControls.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "setInitialDeltaT.H"

    scalar StCoNum = 0.0;
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@ -68,7 +68,7 @@ int main(int argc, char *argv[])
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"

--- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
+++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
@ -46,6 +46,7 @@ int main(int argc, char *argv[])
 #   include "createEngineMesh.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
+#   include "createTimeControls.H"
 #   include "readEngineTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@ -55,6 +55,7 @@ int main(int argc, char *argv[])
 #   include "readCombustionProperties.H"
 #   include "createSpray.H"
 #   include "initContinuityErrs.H"
+#   include "createTimeControls.H"
 #   include "readEngineTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@ -53,7 +53,7 @@ int main(int argc, char *argv[])
 #   include "readCombustionProperties.H"
 #   include "createSpray.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"

--- a/applications/solvers/combustion/engineFoam/engineFoam.C
+++ b/applications/solvers/combustion/engineFoam/engineFoam.C
@ -69,6 +69,7 @@ int main(int argc, char *argv[])
 #   include "readCombustionProperties.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
+#   include "createTimeControls.H"
 #   include "readEngineTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"
--- a/applications/solvers/combustion/fireFoam/fireFoam.C
+++ b/applications/solvers/combustion/fireFoam/fireFoam.C
@ -47,7 +47,7 @@ int main(int argc, char *argv[])
    #include "initContinuityErrs.H"
    #include "createFields.H"
    #include "createRadiationModel.H"
-    #include "readTimeControls.H"
+    #include "createTimeControls.H"
    #include "compressibleCourantNo.H"
    #include "setInitialDeltaT.H"

--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@ -47,7 +47,7 @@ int main(int argc, char *argv[])
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"

--- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"

--- a/applications/solvers/compressible/dbnsFoam/dbnsFoam.C
+++ b/applications/solvers/compressible/dbnsFoam/dbnsFoam.C
@ -54,6 +54,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createMesh.H"
 #   include "createFields.H"
+#   include "createTimeControls.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/compressible/dbnsTurbFoam/dbnsTurbFoam.C
+++ b/applications/solvers/compressible/dbnsTurbFoam/dbnsTurbFoam.C
@ -55,6 +55,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createMesh.H"
 #   include "createFields.H"
+#   include "createTimeControls.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 #   include "createMesh.H"
 #   include "createFields.H"
 #   include "readThermophysicalProperties.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@ -47,6 +47,7 @@ int main(int argc, char *argv[])
    #include "createMesh.H"
    #include "createFields.H"
    #include "initContinuityErrs.H"
+    #include "createTimeControls.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
+++ b/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
@ -43,7 +43,7 @@ int main(int argc, char *argv[])
    #include "createMesh.H"
    #include "createFields.H"
    #include "initContinuityErrs.H"
-    #include "readTimeControls.H"
+    #include "createTimeControls.H"
    #include "compressibleCourantNo.H"
    #include "setInitialDeltaT.H"

--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
@ -49,6 +49,7 @@ int main(int argc, char *argv[])
    #include "createMesh.H"
    #include "createFields.H"
    #include "initContinuityErrs.H"
+    #include "createTimeControls.H"

    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
+++ b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
@ -47,6 +47,7 @@ int main(int argc, char *argv[])
 #   include "createMesh.H"
 #   include "readThermodynamicProperties.H"
 #   include "createFields.H"
+#   include "createTimeControls.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/compressible/sonicDyMFoam/createControls.H
+++ b/applications/solvers/compressible/sonicDyMFoam/createControls.H
@ -0,0 +1,14 @@
+#   include "createTimeControls.H"
+#   include "readPIMPLEControls.H"
+
+    bool correctPhi = false;
+    if (pimple.found("correctPhi"))
+    {
+        correctPhi = Switch(pimple.lookup("correctPhi"));
+    }
+
+    bool checkMeshCourantNo = false;
+    if (pimple.found("checkMeshCourantNo"))
+    {
+        checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo"));
+    }
--- a/applications/solvers/compressible/sonicDyMFoam/readControls.H
+++ b/applications/solvers/compressible/sonicDyMFoam/readControls.H
@ -1,13 +1,13 @@
 #   include "readTimeControls.H"
 #   include "readPIMPLEControls.H"

-    bool correctPhi = false;
+    correctPhi = false;
    if (pimple.found("correctPhi"))
    {
        correctPhi = Switch(pimple.lookup("correctPhi"));
    }

-    bool checkMeshCourantNo = false;
+    checkMeshCourantNo = false;
    if (pimple.found("checkMeshCourantNo"))
    {
        checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo"));
--- a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
@ -58,6 +58,7 @@ int main(int argc, char *argv[])
 #   include "createDynamicFvMesh.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
+#   include "createControls.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/compressible/sonicFoam/sonicFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C
@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 #   include "createMesh.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
+#   include "createTimeControls.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatFoam.C
+++ b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatFoam.C
@ -51,7 +51,7 @@ int main(int argc, char *argv[])
 #   include "createFields.H"
 #   include "createSolidFields.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"

--- a/applications/solvers/engine/icoDyMEngineFoam/createControls.H
+++ b/applications/solvers/engine/icoDyMEngineFoam/createControls.H
@ -0,0 +1,6 @@
+#   include "createTimeControls.H"
+
+    bool checkMeshCourantNo
+    (
+        piso.dict().lookupOrDefault("checkMeshCourantNo", false)
+    );
--- a/applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C
+++ b/applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C
@ -51,6 +51,7 @@ int main(int argc, char *argv[])

 #   include "initContinuityErrs.H"
 #   include "createFields.H"
+#   include "createControls.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/engine/icoDyMEngineFoam/readControls.H
+++ b/applications/solvers/engine/icoDyMEngineFoam/readControls.H
@ -1,6 +1,4 @@
 #   include "readTimeControls.H"

-    bool checkMeshCourantNo
-    (
-        piso.dict().lookupOrDefault("checkMeshCourantNo", false)
-    );
+    checkMeshCourantNo =
+        piso.dict().lookupOrDefault("checkMeshCourantNo", false);
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/readEngineTimeControls.H
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/readEngineTimeControls.H
@ -1,3 +1,3 @@
-#include "readTimeControls.H"
+#   include "readTimeControls.H"

    maxDeltaT = runTime.userTimeToTime(maxDeltaT);
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C
@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 #   include "readPIMPLEControls.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
+#   include "createTimeControls.H"
 #   include "readEngineTimeControls.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
--- a/applications/solvers/engine/turbDyMEngineFoam/createControls.H
+++ b/applications/solvers/engine/turbDyMEngineFoam/createControls.H
@ -0,0 +1,8 @@
+#   include "createTimeControls.H"
+#   include "readPISOControls.H"
+
+    bool checkMeshCourantNo = false;
+    if (piso.found("checkMeshCourantNo"))
+    {
+        checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
+    }
--- a/applications/solvers/engine/turbDyMEngineFoam/readControls.H
+++ b/applications/solvers/engine/turbDyMEngineFoam/readControls.H
@ -1,7 +1,7 @@
 #   include "readTimeControls.H"
 #   include "readPISOControls.H"

-    bool checkMeshCourantNo = false;
+    checkMeshCourantNo = false;
    if (piso.found("checkMeshCourantNo"))
    {
        checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
--- a/applications/solvers/engine/turbDyMEngineFoam/turbDyMEngineFoam.C
+++ b/applications/solvers/engine/turbDyMEngineFoam/turbDyMEngineFoam.C
@ -47,6 +47,7 @@ int main(int argc, char *argv[])
 #   include "createDynamicFvMesh.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
+#   include "createControls.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C
+++ b/applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C
@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 #   include "readTransportProperties.H"
 #   include "createFaFields.H"
 #   include "createFvFields.H"
+#   include "createTimeControls.H"

    Info << "\nStarting time loop\n" << endl;

--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"

--- a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"

--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
@ -55,7 +55,7 @@ int main(int argc, char *argv[])

    #include "initContinuityErrs.H"

-    #include "readTimeControls.H"
+    #include "createTimeControls.H"
    #include "readSolidTimeControls.H"


--- a/applications/solvers/immersedBoundary/interIbFoam/interIbFoam.C
+++ b/applications/solvers/immersedBoundary/interIbFoam/interIbFoam.C
@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
 #   include "createIbMasks.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "correctPhi.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
--- a/applications/solvers/incompressible/icoDyMFoam/createControls.H
+++ b/applications/solvers/incompressible/icoDyMFoam/createControls.H
@ -0,0 +1,11 @@
+#include "createTimeControls.H"
+
+bool correctPhi
+(
+    piso.dict().lookupOrDefault("correctPhi", false)
+);
+
+bool checkMeshCourantNo
+(
+    piso.dict().lookupOrDefault("checkMeshCourantNo", false)
+);
--- a/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C
+++ b/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C
@ -50,6 +50,7 @@ int main(int argc, char *argv[])
 #   include "initContinuityErrs.H"
 #   include "initTotalVolume.H"
 #   include "createFields.H"
+#   include "createControls.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/incompressible/icoDyMFoam/readControls.H
+++ b/applications/solvers/incompressible/icoDyMFoam/readControls.H
@ -1,11 +1,5 @@
-#   include "readTimeControls.H"
+#include "readTimeControls.H"

-    bool correctPhi
-    (
-        piso.dict().lookupOrDefault("correctPhi", false)
-    );
+correctPhi = piso.dict().lookupOrDefault("correctPhi", false);

-    bool checkMeshCourantNo
-    (
-        piso.dict().lookupOrDefault("checkMeshCourantNo", false)
-    );
+checkMeshCourantNo = piso.dict().lookupOrDefault("checkMeshCourantNo", false);
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/createControls.H
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/createControls.H
@ -0,0 +1,11 @@
+#include "createTimeControls.H"
+
+bool correctPhi
+(
+    piso.dict().lookupOrDefault("correctPhi", false)
+);
+
+bool checkMeshCourantNo
+(
+    piso.dict().lookupOrDefault("checkMeshCourantNo", false)
+);
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
@ -51,6 +51,7 @@ int main(int argc, char *argv[])
 #   include "initContinuityErrs.H"
 #   include "initTotalVolume.H"
 #   include "createFields.H"
+#   include "createControls.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/incompressible/icoDyMSimpleFoam/readControls.H
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/readControls.H
@ -1,11 +1,5 @@
-#   include "readTimeControls.H"
+#include "readTimeControls.H"

-    bool correctPhi
-    (
-        piso.dict().lookupOrDefault("correctPhi", false)
-    );
+correctPhi = piso.dict().lookupOrDefault("correctPhi", false);

-    bool checkMeshCourantNo
-    (
-        piso.dict().lookupOrDefault("checkMeshCourantNo", false)
-    );
+checkMeshCourantNo = piso.dict().lookupOrDefault("checkMeshCourantNo", false);
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@ -49,6 +49,7 @@ int main(int argc, char *argv[])

 #   include "createFields.H"
 #   include "initContinuityErrs.H"
+#   include "createTimeControls.H"

    Info<< "\nStarting time loop\n" << endl;

--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@ -59,7 +59,7 @@ int main(int argc, char *argv[])
    #include "createClouds.H"
    #include "createRadiationModel.H"
    #include "initContinuityErrs.H"
-    #include "readTimeControls.H"
+    #include "createTimeControls.H"
    #include "compressibleCourantNo.H"
    #include "setInitialDeltaT.H"

--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
@ -66,7 +66,7 @@ int main(int argc, char *argv[])
    #include "createExplicitSources.H"
    #include "createPorousZones.H"
    #include "initContinuityErrs.H"
-    #include "readTimeControls.H"
+    #include "createTimeControls.H"
    #include "compressibleCourantNo.H"
    #include "setInitialDeltaT.H"

--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@ -52,7 +52,7 @@ int main(int argc, char *argv[])
    #include "createClouds.H"
    #include "createRadiationModel.H"
    #include "initContinuityErrs.H"
-    #include "readTimeControls.H"
+    #include "createTimeControls.H"
    #include "compressibleCourantNo.H"
    #include "setInitialDeltaT.H"

--- a/applications/solvers/multiphase/MRFInterFoam/MRFInterFoam.C
+++ b/applications/solvers/multiphase/MRFInterFoam/MRFInterFoam.C
@ -56,7 +56,7 @@ int main(int argc, char *argv[])
    #include "initContinuityErrs.H"
    #include "createFields.H"
    #include "createMRFZones.H"
-    #include "readTimeControls.H"
+    #include "createTimeControls.H"
    #include "correctPhi.H"
    #include "CourantNo.H"
    #include "setInitialDeltaT.H"
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createMesh.H"
 #   include "readThermodynamicProperties.H"
-#   include "readControls.H"
+#   include "createControls.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 #   include "compressibleCourantNo.H"
--- a/applications/solvers/multiphase/cavitatingFoam/createControls.H
+++ b/applications/solvers/multiphase/cavitatingFoam/createControls.H
@ -0,0 +1,6 @@
+#include "createTimeControls.H"
+
+scalar maxAcousticCo
+(
+    readScalar(runTime.controlDict().lookup("maxAcousticCo"))
+);
--- a/applications/solvers/multiphase/cavitatingFoam/readControls.H
+++ b/applications/solvers/multiphase/cavitatingFoam/readControls.H
@ -1,9 +1,5 @@
 #include "readTimeControls.H"

-scalar maxAcousticCo
-(
-    readScalar(runTime.controlDict().lookup("maxAcousticCo"))
-);
-
+maxAcousticCo = readScalar(runTime.controlDict().lookup("maxAcousticCo"));

 #include "readPISOControls.H"
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@ -52,7 +52,7 @@ int main(int argc, char *argv[])
    #include "createTime.H"
    #include "createDynamicFvMesh.H"
    #include "readGravitationalAcceleration.H"
-    #include "readControls.H"
+    #include "createControls.H"
    #include "initContinuityErrs.H"
    #include "createFields.H"
    #include "CourantNo.H"
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/createControls.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/createControls.H
@ -0,0 +1,27 @@
+   #include "readPISOControls.H"
+   #include "createTimeControls.H"
+
+    label nAlphaSubCycles
+    (
+        readLabel(piso.lookup("nAlphaSubCycles"))
+    );
+
+    if (nAlphaSubCycles > 1 && nOuterCorr != 1)
+    {
+        FatalErrorIn(args.executable())
+            << "Sub-cycling alpha is only allowed for PISO, "
+               "i.e. when the number of outer-correctors = 1"
+            << exit(FatalError);
+    }
+
+    bool correctPhi = true;
+    if (piso.found("correctPhi"))
+    {
+        correctPhi = Switch(piso.lookup("correctPhi"));
+    }
+
+    bool checkMeshCourantNo = false;
+    if (piso.found("checkMeshCourantNo"))
+    {
+        checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
+    }
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
@ -1,10 +1,7 @@
   #include "readPISOControls.H"
   #include "readTimeControls.H"

-    label nAlphaSubCycles
-    (
-        readLabel(piso.lookup("nAlphaSubCycles"))
-    );
+    nAlphaSubCycles = readLabel(piso.lookup("nAlphaSubCycles"));

    if (nAlphaSubCycles > 1 && nOuterCorr != 1)
    {
@ -14,13 +11,13 @@
            << exit(FatalError);
    }

-    bool correctPhi = true;
+    correctPhi = true;
    if (piso.found("correctPhi"))
    {
        correctPhi = Switch(piso.lookup("correctPhi"));
    }

-    bool checkMeshCourantNo = false;
+    checkMeshCourantNo = false;
    if (piso.found("checkMeshCourantNo"))
    {
        checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@ -50,7 +50,7 @@ int main(int argc, char *argv[])
    #include "createTime.H"
    #include "createMesh.H"
    #include "readGravitationalAcceleration.H"
-    #include "readControls.H"
+    #include "createControls.H"
    #include "initContinuityErrs.H"
    #include "createFields.H"
    #include "CourantNo.H"
--- a/applications/solvers/multiphase/compressibleInterFoam/createControls.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/createControls.H
@ -0,0 +1,15 @@
+   #include "readPISOControls.H"
+   #include "createTimeControls.H"
+
+    label nAlphaSubCycles
+    (
+        readLabel(piso.lookup("nAlphaSubCycles"))
+    );
+
+    if (nAlphaSubCycles > 1 && nOuterCorr != 1)
+    {
+        FatalErrorIn(args.executable())
+            << "Sub-cycling alpha is only allowed for PISO, "
+               "i.e. when the number of outer-correctors = 1"
+            << exit(FatalError);
+    }
--- a/applications/solvers/multiphase/compressibleInterFoam/readControls.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/readControls.H
@ -1,10 +1,7 @@
   #include "readPISOControls.H"
   #include "readTimeControls.H"

-    label nAlphaSubCycles
-    (
-        readLabel(piso.lookup("nAlphaSubCycles"))
-    );
+    nAlphaSubCycles = readLabel(piso.lookup("nAlphaSubCycles"));

    if (nAlphaSubCycles > 1 && nOuterCorr != 1)
    {
--- a/applications/solvers/multiphase/interDyMFoam/createControls.H
+++ b/applications/solvers/multiphase/interDyMFoam/createControls.H
@ -0,0 +1,13 @@
+#   include "createTimeControls.H"
+
+    bool correctPhi = true;
+    if (pimple.found("correctPhi"))
+    {
+        correctPhi = Switch(pimple.lookup("correctPhi"));
+    }
+
+    bool checkMeshCourantNo = false;
+    if (pimple.found("checkMeshCourantNo"))
+    {
+        checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo"));
+    }
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
@ -51,7 +51,7 @@ int main(int argc, char *argv[])
 #   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
-#   include "readTimeControls.H"
+#   include "createControls.H"
 #   include "correctPhi.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
--- a/applications/solvers/multiphase/interDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/interDyMFoam/readControls.H
@ -1,13 +1,13 @@
 #   include "readTimeControls.H"
 #   include "readPIMPLEControls.H"

-    bool correctPhi = true;
+    correctPhi = true;
    if (pimple.found("correctPhi"))
    {
        correctPhi = Switch(pimple.lookup("correctPhi"));
    }

-    bool checkMeshCourantNo = false;
+    checkMeshCourantNo = false;
    if (pimple.found("checkMeshCourantNo"))
    {
        checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo"));
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@ -55,7 +55,7 @@ int main(int argc, char *argv[])
 #   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "correctPhi.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
--- a/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
+++ b/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 #   include "readPISOControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
 #   include "correctPhi.H"
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@ -58,7 +58,7 @@ int main(int argc, char *argv[])
 #   include "readPISOControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "correctPhi.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@ -43,11 +43,11 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
-    #include "readGravitationalAcceleration.H"
+#   include "readGravitationalAcceleration.H"
 #   include "readPISOControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "correctPhi.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
--- a/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C
+++ b/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C
@ -58,7 +58,7 @@ int main(int argc, char *argv[])
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
 #   include "createPorousZones.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "correctPhi.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 #   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"

--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@ -54,7 +54,7 @@ int main(int argc, char *argv[])
 #   include "createFields.H"
 #   include "readPPProperties.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"

--- a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/icoFsiFoam.C
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/icoFsiFoam.C
@ -56,7 +56,7 @@ int main(int argc, char *argv[])
 #   include "createStressFields.H"
 #   include "readMechanicalProperties.H"
 #   include "readCouplingProperties.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"

 #   include "initContinuityErrs.H"

--- a/applications/solvers/viscoelastic/viscoelasticFluidFoam/viscoelasticFluidFoam.C
+++ b/applications/solvers/viscoelastic/viscoelasticFluidFoam/viscoelasticFluidFoam.C
@ -46,6 +46,7 @@ int main(int argc, char *argv[])
 #   include "createMesh.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
+#   include "createTimeControls.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //