ENH: Propagating pimpleControl across pimple-based solvers

applications/solvers/combustion/fireFoam/fireFoam.C

@@ -34,7 +34,7 @@ Description
 #include "turbulenceModel.H"
 #include "combustionModel.H"
 #include "radiationModel.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,6 +51,8 @@ int main(int argc, char *argv[])
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
+    pimpleControl pimple(mesh);
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -61,6 +63,7 @@ int main(int argc, char *argv[])
         #include "readTimeControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
+        pimple.read();
 
         runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
@@ -68,12 +71,7 @@ int main(int argc, char *argv[])
         #include "rhoEqn.H"
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for
+        for (pimple.start(); pimple.loop(); pimple++)
-        (
-            pimpleLoop pimpleCorr(mesh, nOuterCorr);
-            pimpleCorr.loop();
-            pimpleCorr++
-        )
         {
             #include "UEqn.H"
 

applications/solvers/combustion/fireFoam/pEqn.H

@@ -32,11 +32,9 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
         (
             p_rgh.select
             (
-                (
+                pimple.finalIter()
-                    pimpleCorr.finalIter()
+             && corr == nCorr-1
-                 && corr == nCorr-1
+             && nonOrth == nNonOrthCorr
-                 && nonOrth == nNonOrthCorr
-                )
             )
         )
     );

applications/solvers/combustion/rhoReactingFoam/pEqn.H

@@ -44,11 +44,9 @@
                 (
                     p.select
                     (
-                        (
+                        pimple.finalIter()
-                            pimpleCorr.finalIter()
+                     && corr == nCorr-1
-                         && corr == nCorr-1
+                     && nonOrth == nNonOrthCorr
-                         && nonOrth == nNonOrthCorr
-                        )
                     )
                 )
             );
@@ -88,11 +86,9 @@
                 (
                     p.select
                     (
-                        (
+                        pimple.finalIter()
-                            pimpleCorr.finalIter()
+                     && corr == nCorr-1
-                         && corr == nCorr-1
+                     && nonOrth == nNonOrthCorr
-                         && nonOrth == nNonOrthCorr
-                        )
                     )
                 )
             );

applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C

@@ -36,7 +36,7 @@ Description
 #include "rhoChemistryModel.H"
 #include "chemistrySolver.H"
 #include "multivariateScheme.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,6 +53,8 @@ int main(int argc, char *argv[])
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
+    pimpleControl pimple(mesh);
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -60,9 +62,10 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
         #include "readTimeControls.H"
-        #include "readPISOControls.H"
+        #include "readPIMPLEControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
+        pimple.read();
 
         runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
@@ -71,12 +74,7 @@ int main(int argc, char *argv[])
         #include "rhoEqn.H"
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for
+        for (pimple.start(); pimple.loop(); pimple++)
-        (
-            pimpleLoop pimpleCorr(mesh, nOuterCorr);
-            pimpleCorr.loop();
-            pimpleCorr++
-        )
         {
             #include "UEqn.H"
             #include "YEqn.H"

applications/solvers/compressible/rhoPimpleFoam/pEqn.H

@@ -37,7 +37,7 @@ if (transonic)
             (
                 p.select
                 (
-                    pimpleCorr.finalIter()
+                    pimple.finalIter()
                  && corr == nCorr-1
                  && nonOrth == nNonOrthCorr
                 )
@@ -75,7 +75,7 @@ else
             (
                 p.select
                 (
-                    pimpleCorr.finalIter()
+                    pimple.finalIter()
                  && corr == nCorr-1
                  && nonOrth == nNonOrthCorr
                 )

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C

@@ -37,7 +37,7 @@ Description
 #include "basicPsiThermo.H"
 #include "turbulenceModel.H"
 #include "bound.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,6 +49,8 @@ int main(int argc, char *argv[])
     #include "createFields.H"
     #include "initContinuityErrs.H"
 
+    pimpleControl pimple(mesh);
+
     Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
@@ -57,6 +59,7 @@ int main(int argc, char *argv[])
         #include "readPIMPLEControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
+        pimple.read();
 
         runTime++;
 
@@ -65,12 +68,7 @@ int main(int argc, char *argv[])
         #include "rhoEqn.H"
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for
+        for (pimple.start(); pimple.loop(); pimple++)
-        (
-            pimpleLoop pimpleCorr(mesh, nOuterCorr);
-            pimpleCorr.loop();
-            pimpleCorr++
-        )
         {
             if (nOuterCorr != 1)
             {

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C

@@ -40,7 +40,7 @@ Description
 #include "MRFZones.H"
 #include "porousZones.H"
 #include "fvcSmooth.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 #include "bound.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,6 +56,10 @@ int main(int argc, char *argv[])
     #include "createZones.H"
     #include "initContinuityErrs.H"
 
+    pimpleControl pimple(mesh);
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
     Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
@@ -64,6 +68,7 @@ int main(int argc, char *argv[])
         #include "readPIMPLEControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
+        pimple.read();
 
         runTime++;
 
@@ -74,12 +79,7 @@ int main(int argc, char *argv[])
         #include "rhoEqn.H"
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for
+        for (pimple.start(); pimple.loop(); pimple++)
-        (
-            pimpleLoop pimpleCorr(mesh, nOuterCorr);
-            pimpleCorr.loop();
-            pimpleCorr++
-        )
         {
             if (nOuterCorr != 1)
             {

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setInitialrDeltaT.H

@@ -1,6 +1,6 @@
 scalar maxDeltaT
 (
-    pimple.lookupOrDefault<scalar>("maxDeltaT", GREAT)
+    pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
 );
 
 volScalarField rDeltaT

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H

@@ -1,22 +1,22 @@
 {
     scalar maxCo
     (
-        pimple.lookupOrDefault<scalar>("maxCo", 0.8)
+        pimpleDict.lookupOrDefault<scalar>("maxCo", 0.8)
     );
 
     scalar rDeltaTSmoothingCoeff
     (
-        pimple.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.02)
+        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.02)
     );
 
     scalar rDeltaTDampingCoeff
     (
-        pimple.lookupOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
+        pimpleDict.lookupOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
     );
 
     scalar maxDeltaT
     (
-        pimple.lookupOrDefault<scalar>("maxDeltaT", GREAT)
+        pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
     );
 
     volScalarField rDeltaT0("rDeltaT0", rDeltaT);

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H

@@ -39,11 +39,9 @@ if (transonic)
             (
                 p.select
                 (
-                    (
+                    pimple.finalIter()
-                       pimpleCorr.finalIter()
+                 && corr == nCorr-1
-                     && corr == nCorr-1
+                 && nonOrth == nNonOrthCorr
-                     && nonOrth == nNonOrthCorr
-                    )
                 )
             )
         );
@@ -80,11 +78,9 @@ else
             (
                 p.select
                 (
-                    (
+                    pimple.finalIter()
-                        pimpleCorr.finalIter()
+                 && corr == nCorr-1
-                     && corr == nCorr-1
+                 && nonOrth == nNonOrthCorr
-                     && nonOrth == nNonOrthCorr
-                    )
                 )
             )
         );

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C

@@ -39,7 +39,7 @@ Description
 #include "bound.H"
 #include "MRFZones.H"
 #include "porousZones.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,6 +52,8 @@ int main(int argc, char *argv[])
     #include "createZones.H"
     #include "initContinuityErrs.H"
 
+    pimpleControl pimple(mesh);
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -62,6 +64,7 @@ int main(int argc, char *argv[])
         #include "readPIMPLEControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
+        pimple.read();
 
         runTime++;
 
@@ -70,12 +73,7 @@ int main(int argc, char *argv[])
         #include "rhoEqn.H"
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for
+        for (pimple.start(); pimple.loop(); pimple++)
-        (
-            pimpleLoop pimpleCorr(mesh, nOuterCorr);
-            pimpleCorr.loop();
-            pimpleCorr++
-        )
         {
             if (nOuterCorr != 1)
             {

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C

@@ -48,7 +48,7 @@ Description
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "RASModel.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -64,6 +64,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    pimpleControl pimple(mesh);
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -76,14 +78,10 @@ int main(int argc, char *argv[])
         #include "readPIMPLEControls.H"
         #include "CourantNo.H"
         #include "setDeltaT.H"
+        pimple.read();
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for
+        for (pimple.start(); pimple.loop(); pimple++)
-        (
-            pimpleLoop pimpleCorr(mesh, nOuterCorr);
-            pimpleCorr.loop();
-            pimpleCorr++
-        )
         {
             if (nOuterCorr != 1)
             {

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H

@@ -25,11 +25,9 @@
             (
                 p_rgh.select
                 (
-                    (
+                    pimple.finalIter()
-                        pimpleCorr.finalIter()
+                 && corr == nCorr-1
-                     && corr == nCorr-1
+                 && nonOrth == nNonOrthCorr
-                     && nonOrth == nNonOrthCorr
-                    )
                 )
             )
         );

applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C

@@ -37,7 +37,7 @@ Description
 #include "basicRhoThermo.H"
 #include "turbulenceModel.H"
 #include "fixedGradientFvPatchFields.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,6 +53,8 @@ int main(int argc, char *argv[])
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
+    pimpleControl pimple(mesh);
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -63,6 +65,7 @@ int main(int argc, char *argv[])
         #include "readPIMPLEControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
+        pimple.read();
 
         runTime++;
 
@@ -71,12 +74,7 @@ int main(int argc, char *argv[])
         #include "rhoEqn.H"
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for
+        for (pimple.start(); pimple.loop(); pimple++)
-        (
-            pimpleLoop pimpleCorr(mesh, nOuterCorr);
-            pimpleCorr.loop();
-            pimpleCorr++
-        )
         {
             if (nOuterCorr != 1)
             {

applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H

@@ -39,11 +39,9 @@
             (
                 p_rgh.select
                 (
-                    (
+                    pimple.finalIter()
-                        pimpleCorr.finalIter()
+                 && corr == nCorr-1
-                     && corr == nCorr-1
+                 && nonOrth == nNonOrthCorr
-                     && nonOrth == nNonOrthCorr
-                    )
                 )
             )
         );

applications/solvers/incompressible/pimpleFoam/pEqn.H

@@ -27,7 +27,7 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
         (
             p.select
             (
-                pimpleCorr.finalIter()
+                pimple.finalIter()
              && corr == nCorr-1
              && nonOrth == nNonOrthCorr
             )

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

@@ -29,11 +29,9 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
         (
             p.select
             (
-                (
+                pimple.finalIter()
-                    pimpleCorr.finalIter()
+             && corr == nCorr-1
-                 && corr == nCorr-1
+             && nonOrth == nNonOrthCorr
-                 && nonOrth == nNonOrthCorr
-                )
             )
         )
     );

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

@@ -36,7 +36,7 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "turbulenceModel.H"
 #include "dynamicFvMesh.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,11 +46,12 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "readPIMPLEControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "readTimeControls.H"
 
+    pimpleControl pimple(mesh);
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -59,6 +60,7 @@ int main(int argc, char *argv[])
     {
         #include "readControls.H"
         #include "CourantNo.H"
+        pimple.read();
 
         // Make the fluxes absolute
         fvc::makeAbsolute(phi, U);
@@ -85,12 +87,7 @@ int main(int argc, char *argv[])
         }
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for
+        for (pimple.start(); pimple.loop(); pimple++)
-        (
-            pimpleLoop pimpleCorr(mesh, nOuterCorr);
-            pimpleCorr.loop();
-            pimpleCorr++
-        )
         {
             if (nOuterCorr != 1)
             {

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

@@ -2,8 +2,8 @@
     #include "readPIMPLEControls.H"
 
     const bool correctPhi =
-        pimple.lookupOrDefault("correctPhi", false);
+        pimpleDict.lookupOrDefault("correctPhi", false);
 
     const bool checkMeshCourantNo =
-        pimple.lookupOrDefault("checkMeshCourantNo", false);
+        pimpleDict.lookupOrDefault("checkMeshCourantNo", false);
 

applications/solvers/incompressible/pimpleFoam/pimpleFoam.C

@@ -35,7 +35,7 @@ Description
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulenceModel.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -47,6 +47,10 @@ int main(int argc, char *argv[])
     #include "createFields.H"
     #include "initContinuityErrs.H"
 
+    pimpleControl pimple(mesh);
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
     Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
@@ -55,18 +59,14 @@ int main(int argc, char *argv[])
         #include "readPIMPLEControls.H"
         #include "CourantNo.H"
         #include "setDeltaT.H"
+        pimple.read();
 
         runTime++;
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for
+        for (pimple.start(); pimple.loop(); pimple++)
-        (
-            pimpleLoop pimpleCorr(mesh, nOuterCorr);
-            pimpleCorr.loop();
-            pimpleCorr++
-        )
         {
             if (nOuterCorr != 1)
             {

applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C

@@ -46,7 +46,7 @@ Description
 #include "timeActivatedExplicitSource.H"
 #include "SLGThermo.H"
 #include "fvcSmooth.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -66,6 +66,8 @@ int main(int argc, char *argv[])
     #include "createPorousZones.H"
     #include "initContinuityErrs.H"
 
+    pimpleControl pimple(mesh);
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -76,6 +78,7 @@ int main(int argc, char *argv[])
         #include "readChemistryProperties.H"
         #include "readAdditionalSolutionControls.H"
         #include "readTimeControls.H"
+        pimple.read();
 
         runTime++;
 
@@ -89,12 +92,7 @@ int main(int argc, char *argv[])
         #include "rhoEqn.H"
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for
+        for (pimple.start(); pimple.loop(); pimple++)
-        (
-            pimpleLoop pimpleCorr(mesh, nOuterCorr);
-            pimpleCorr.loop();
-            pimpleCorr++
-        )
         {
             if (nOuterCorr != 1)
             {

applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H

@@ -46,7 +46,7 @@
             (
                 p.select
                 (
-                    pimpleCorr.finalIter()
+                    pimple.finalIter()
                  && corr == nCorr-1
                  && nonOrth == nNonOrthCorr
                 )

applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C

@@ -45,7 +45,7 @@ Description
 #include "timeActivatedExplicitSource.H"
 #include "radiationModel.H"
 #include "SLGThermo.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,6 +65,8 @@ int main(int argc, char *argv[])
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
+    pimpleControl pimple(mesh);
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -75,6 +77,7 @@ int main(int argc, char *argv[])
         #include "readPISOControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
+        pimple.read();
 
         runTime++;
 
@@ -91,12 +94,7 @@ int main(int argc, char *argv[])
         #include "rhoEqn.H"
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for
+        for (pimple.start(); pimple.loop(); pimple++)
-        (
-            pimpleLoop pimpleCorr(mesh, nOuterCorr);
-            pimpleCorr.loop();
-            pimpleCorr++
-        )
         {
             #include "UEqn.H"
             #include "YEqn.H"

applications/solvers/lagrangian/coalChemistryFoam/pEqn.H

@@ -32,7 +32,7 @@ if (transonic)
             (
                 p.select
                 (
-                    pimpleCorr.finalIter()
+                    pimple.finalIter()
                  && corr == nCorr-1
                  && nonOrth == nNonOrthCorr
                 )
@@ -71,7 +71,7 @@ else
             (
                 p.select
                 (
-                    pimpleCorr.finalIter()
+                    pimple.finalIter()
                  && corr == nCorr-1
                  && nonOrth == nNonOrthCorr
                 )

applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H

@@ -34,7 +34,7 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
         (
             p_rgh.select
             (
-                pimpleCorr.finalIter()
+                pimple.finalIter()
              && corr == nCorr-1
              && nonOrth == nNonOrthCorr
             )

applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C

@@ -39,7 +39,7 @@ Description
 #include "chemistrySolver.H"
 #include "radiationModel.H"
 #include "SLGThermo.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -60,6 +60,8 @@ int main(int argc, char *argv[])
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
+    pimpleControl pimple(mesh);
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -71,6 +73,7 @@ int main(int argc, char *argv[])
         #include "compressibleCourantNo.H"
         #include "setMultiRegionDeltaT.H"
         #include "setDeltaT.H"
+        pimple.read();
 
         runTime++;
 
@@ -86,12 +89,7 @@ int main(int argc, char *argv[])
             #include "rhoEqn.H"
 
             // --- PIMPLE loop
-            for
+            for (pimple.start(); pimple.loop(); pimple++)
-            (
-                pimpleLoop pimpleCorr(mesh, nOuterCorr);
-                pimpleCorr.loop();
-                pimpleCorr++
-            )
             {
                 #include "UEqn.H"
                 #include "YEqn.H"

applications/solvers/lagrangian/reactingParcelFoam/pEqn.H

@@ -32,7 +32,7 @@ if (transonic)
             (
                 p.select
                 (
-                    pimpleCorr.finalIter()
+                    pimple.finalIter()
                  && corr == nCorr-1
                  && nonOrth == nNonOrthCorr
                 )
@@ -71,7 +71,7 @@ else
             (
                 p.select
                 (
-                    pimpleCorr.finalIter()
+                    pimple.finalIter()
                  && corr == nCorr-1
                  && nonOrth == nNonOrthCorr
                 )

applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C

@@ -38,7 +38,7 @@ Description
 #include "chemistrySolver.H"
 #include "radiationModel.H"
 #include "SLGThermo.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -58,6 +58,8 @@ int main(int argc, char *argv[])
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
+    pimpleControl pimple(mesh);
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -65,9 +67,10 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
         #include "readTimeControls.H"
-        #include "readPISOControls.H"
+        #include "readPIMPLEControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
+        pimple.read();
 
         runTime++;
 
@@ -79,12 +82,7 @@ int main(int argc, char *argv[])
         #include "rhoEqn.H"
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for
+        for (pimple.start(); pimple.loop(); pimple++)
-        (
-            pimpleLoop pimpleCorr(mesh, nOuterCorr);
-            pimpleCorr.loop();
-            pimpleCorr++
-        )
         {
             #include "UEqn.H"
             #include "YEqn.H"

applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C

@@ -46,7 +46,7 @@ Description
 #include "interfaceProperties.H"
 #include "phaseChangeTwoPhaseMixture.H"
 #include "turbulenceModel.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -64,16 +64,19 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    pimpleControl pimple(mesh);
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
     {
-        #include "readPISOControls.H"
+        #include "readPIMPLEControls.H"
         #include "readTimeControls.H"
         #include "CourantNo.H"
         #include "setDeltaT.H"
+        pimple.read();
 
         runTime++;
 
@@ -84,12 +87,7 @@ int main(int argc, char *argv[])
         turbulence->correct();
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for
+        for (pimple.start(); pimple.loop(); pimple++)
-        (
-            pimpleLoop pimpleCorr(mesh, nOuterCorr);
-            pimpleCorr.loop();
-            pimpleCorr++
-        )
         {
             #include "UEqn.H"
 

applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H

@@ -39,7 +39,7 @@
             (
                 p_rgh.select
                 (
-                    pimpleCorr.finalIter()
+                    pimple.finalIter()
                  && corr == nCorr-1
                  && nonOrth == nNonOrthCorr
                 )

applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H

@@ -29,7 +29,7 @@
             (
                 p_rgh.select
                 (
-                    pimpleCorr.finalIter()
+                    pimple.finalIter()
                  && corr == nCorr-1
                  && nonOrth == nNonOrthCorr
                 )

applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C

@@ -34,7 +34,7 @@ Description
 #include "fvCFD.H"
 #include "twoPhaseMixture.H"
 #include "turbulenceModel.H"
-#include "pimpleLoop.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,6 +51,8 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    pimpleControl pimple(mesh);
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -61,18 +63,14 @@ int main(int argc, char *argv[])
         #include "readTimeControls.H"
         #include "CourantNo.H"
         #include "setDeltaT.H"
+        pimple.read();
 
         runTime++;
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for
+        for (pimple.start(); pimple.loop(); pimple++)
-        (
-            pimpleLoop pimpleCorr(mesh, nOuterCorr);
-            pimpleCorr.loop();
-            pimpleCorr++
-        )
         {
             twoPhaseProperties.correct();