Applications: use pimpleControl.dict() and simpleControl.dict() instead of looking-up the sub-dict

fe8c5ff6 · Henry · 156fd4dc · fe8c5ff6 · fe8c5ff6 · fe8c5ff6
Commit fe8c5ff6 authored Feb 09, 2015 by Henry
--- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C
+++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.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-2015 OpenFOAM Foundation
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,10 +40,11 @@ int main(int argc, char *argv[])

    #include "createTime.H"
    #include "createMesh.H"
-    #include "createFields.H"

    simpleControl simple(mesh);

+    #include "createFields.H"
+
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

    Info<< "\nCalculating temperature distribution\n" << endl;

--- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
+++ b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
@@ -2,7 +2,7 @@
  =========                 |
  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,11 +40,12 @@ int main(int argc, char *argv[])
    #include "setRootCase.H"
    #include "createTime.H"
    #include "createMesh.H"
-    #include "createFields.H"
-    #include "createFvOptions.H"

    simpleControl simple(mesh);

+    #include "createFields.H"
+    #include "createFvOptions.H"
+
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

    Info<< "\nCalculating scalar transport\n" << endl;

--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -86,6 +86,9 @@ int main(int argc, char *argv[])

    #include "createTime.H"
    #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
    #include "readCombustionProperties.H"
    #include "readGravitationalAcceleration.H"
    #include "createFields.H"
@@ -94,8 +97,6 @@ int main(int argc, char *argv[])
    #include "compressibleCourantNo.H"
    #include "setInitialDeltaT.H"

-    pimpleControl pimple(mesh);
-
    scalar StCoNum = 0.0;

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

--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -76,6 +76,9 @@ int main(int argc, char *argv[])

    #include "createTime.H"
    #include "createDynamicFvMesh.H"
+
+    pimpleControl pimple(mesh);
+
    #include "readCombustionProperties.H"
    #include "readGravitationalAcceleration.H"
    #include "createFields.H"
@@ -84,8 +87,6 @@ int main(int argc, char *argv[])
    #include "compressibleCourantNo.H"
    #include "setInitialDeltaT.H"

-    pimpleControl pimple(mesh);
-
    scalar StCoNum = 0.0;

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

--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -66,6 +66,9 @@ int main(int argc, char *argv[])

    #include "createTime.H"
    #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
    #include "readCombustionProperties.H"
    #include "readGravitationalAcceleration.H"
    #include "createFields.H"
@@ -75,8 +78,6 @@ int main(int argc, char *argv[])
    #include "compressibleCourantNo.H"
    #include "setInitialDeltaT.H"

-    pimpleControl pimple(mesh);
-
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

--- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
+++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
@@ -46,6 +46,9 @@ int main(int argc, char *argv[])

    #include "createEngineTime.H"
    #include "createEngineMesh.H"
+
+    pimpleControl pimple(mesh);
+
    #include "createFields.H"
    #include "createFvOptions.H"
    #include "createRhoUf.H"
@@ -55,8 +58,6 @@ int main(int argc, char *argv[])
    #include "setInitialDeltaT.H"
    #include "startSummary.H"

-    pimpleControl pimple(mesh);
-
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

--- a/applications/solvers/combustion/engineFoam/engineFoam.C
+++ b/applications/solvers/combustion/engineFoam/engineFoam.C
@@ -69,6 +69,9 @@ int main(int argc, char *argv[])

    #include "createEngineTime.H"
    #include "createEngineMesh.H"
+
+    pimpleControl pimple(mesh);
+
    #include "readCombustionProperties.H"
    #include "createFields.H"
    #include "createFvOptions.H"
@@ -79,8 +82,6 @@ int main(int argc, char *argv[])
    #include "setInitialDeltaT.H"
    #include "startSummary.H"

-    pimpleControl pimple(mesh);
-
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

--- a/applications/solvers/combustion/fireFoam/fireFoam.C
+++ b/applications/solvers/combustion/fireFoam/fireFoam.C
@@ -51,6 +51,9 @@ int main(int argc, char *argv[])

    #include "createTime.H"
    #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
    #include "readGravitationalAcceleration.H"
    #include "createFields.H"
    #include "createFvOptions.H"
@@ -64,8 +67,6 @@ int main(int argc, char *argv[])
    #include "setInitialDeltaT.H"
    #include "readPyrolysisTimeControls.H"

-    pimpleControl pimple(mesh);
-
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -43,6 +43,9 @@ int main(int argc, char *argv[])
    #include "setRootCase.H"
    #include "createTime.H"
    #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
    #include "readGravitationalAcceleration.H"
    #include "createFields.H"
    #include "createFvOptions.H"
@@ -51,8 +54,6 @@ int main(int argc, char *argv[])
    #include "compressibleCourantNo.H"
    #include "setInitialDeltaT.H"

-    pimpleControl pimple(mesh);
-
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
@@ -45,6 +45,9 @@ int main(int argc, char *argv[])
    #include "setRootCase.H"
    #include "createTime.H"
    #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
    #include "readGravitationalAcceleration.H"
    #include "createFields.H"
    #include "createFvOptions.H"
@@ -53,8 +56,6 @@ int main(int argc, char *argv[])
    #include "compressibleCourantNo.H"
    #include "setInitialDeltaT.H"

-    pimpleControl pimple(mesh);
-
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
@@ -44,6 +44,9 @@ int main(int argc, char *argv[])
    #include "setRootCase.H"
    #include "createTime.H"
    #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
    #include "readGravitationalAcceleration.H"
    #include "createFields.H"
    #include "createFvOptions.H"
@@ -52,8 +55,6 @@ int main(int argc, char *argv[])
    #include "compressibleCourantNo.H"
    #include "setInitialDeltaT.H"

-    pimpleControl pimple(mesh);
-
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

--- a/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C
+++ b/applications/solvers/electromagnetics/magneticFoam/magneticFoam.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-2015 OpenFOAM Foundation
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,10 +65,11 @@ int main(int argc, char *argv[])
    #include "setRootCase.H"
    #include "createTime.H"
    #include "createMesh.H"
-    #include "createFields.H"

    simpleControl simple(mesh);

+    #include "createFields.H"
+
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

    Info<< "Calculating the magnetic field potential" << endl;

--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
@@ -60,6 +60,9 @@ int main(int argc, char *argv[])
    #include "setRootCase.H"
    #include "createTime.H"
    #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
    #include "readGravitationalAcceleration.H"
    #include "createFields.H"
    #include "createIncompressibleRadiationModel.H"
@@ -69,8 +72,6 @@ int main(int argc, char *argv[])
    #include "CourantNo.H"
    #include "setInitialDeltaT.H"

-    pimpleControl pimple(mesh);
-
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H
@@ -102,7 +102,7 @@
    (
        p,
        p_rgh,
-        mesh.solutionDict().subDict("PIMPLE"),
+        pimple.dict(),
        pRefCell,
        pRefValue
    );

--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -59,13 +59,14 @@ int main(int argc, char *argv[])
    #include "setRootCase.H"
    #include "createTime.H"
    #include "createMesh.H"
+
+    simpleControl simple(mesh);
+
    #include "readGravitationalAcceleration.H"
    #include "createFields.H"
    #include "createFvOptions.H"
    #include "initContinuityErrs.H"

-    simpleControl simple(mesh);
-
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H
@@ -102,7 +102,7 @@
    (
        p,
        p_rgh,
-        mesh.solutionDict().subDict("SIMPLE"),
+        simple.dict(),
        pRefCell,
        pRefValue
    );

--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
@@ -48,6 +48,9 @@ int main(int argc, char *argv[])
    #include "setRootCase.H"
    #include "createTime.H"
    #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
    #include "readGravitationalAcceleration.H"
    #include "createFields.H"
    #include "createFvOptions.H"
@@ -57,8 +60,6 @@ int main(int argc, char *argv[])
    #include "compressibleCourantNo.H"
    #include "setInitialDeltaT.H"

-    pimpleControl pimple(mesh);
-
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -45,14 +45,15 @@ int main(int argc, char *argv[])
    #include "setRootCase.H"
    #include "createTime.H"
    #include "createMesh.H"
+
+    simpleControl simple(mesh);
+
    #include "readGravitationalAcceleration.H"
    #include "createFields.H"
    #include "createFvOptions.H"
    #include "createRadiationModel.H"
    #include "initContinuityErrs.H"

-    simpleControl simple(mesh);
-
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
@@ -77,7 +77,7 @@
    (
        p,
        p_rgh,
-        mesh.solutionDict().subDict("SIMPLE"),
+        simple.dict(),
        pRefCell,
        pRefValue
    );

--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
@@ -72,12 +72,13 @@ int main(int argc, char *argv[])

    #include "createTime.H"
    #include "createMesh.H"
+
+    simpleControl simple(mesh);
+
    #include "createFields.H"
    #include "initContinuityErrs.H"
    #include "initAdjointContinuityErrs.H"

-    simpleControl simple(mesh);
-
    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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