diff --git a/applications/solvers/DNS/dnsFoam/createFields.H b/applications/solvers/DNS/dnsFoam/createFields.H
index 36fc513e0..34a2b963f 100644
--- a/applications/solvers/DNS/dnsFoam/createFields.H
+++ b/applications/solvers/DNS/dnsFoam/createFields.H
@@ -27,3 +27,5 @@
     );
 
 #   include "createPhi.H"
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C
index 84e2f0fbb..6219abde1 100644
--- a/applications/solvers/DNS/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C
@@ -35,6 +35,7 @@ Description
 #include "fft.H"
 #include "calcEk.H"
 #include "graph.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,6 +45,9 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
     #include "createMeshNoClear.H"
+
+    pisoControl piso(mesh);
+
     #include "readTransportProperties.H"
     #include "createFields.H"
     #include "readTurbulenceProperties.H"
@@ -57,8 +61,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        #include "readPISOControls.H"
-
         force.internalField() = ReImSum
         (
             fft::reverseTransform
@@ -83,7 +85,7 @@ int main(int argc, char *argv[])
 
         // --- PISO loop
 
-        for (int corr=1; corr<=1; corr++)
+        while (piso.correct())
         {
             volScalarField rUA = 1.0/UEqn.A();
 
diff --git a/applications/solvers/basic/laplacianFoam/laplacianFoam.C b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
index d025f6bb4..6c78e8f7e 100644
--- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C
+++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
 
     Info<< "\nCalculating temperature distribution\n" << endl;
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
diff --git a/applications/solvers/basic/potentialDyMFoam/createFields.H b/applications/solvers/basic/potentialDyMFoam/createFields.H
index f29c44789..6f3ccee89 100644
--- a/applications/solvers/basic/potentialDyMFoam/createFields.H
+++ b/applications/solvers/basic/potentialDyMFoam/createFields.H
@@ -47,5 +47,5 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C b/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C
index 763ebf180..af3bcdcda 100644
--- a/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C
+++ b/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C
@@ -80,8 +80,6 @@ int main(int argc, char *argv[])
 
         while (piso.correctNonOrthogonal())
         {
-            p.storePrevIter();
-
             fvScalarMatrix pEqn
             (
                 fvm::laplacian
diff --git a/applications/solvers/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H
index 108ad4e6d..604aef5cf 100644
--- a/applications/solvers/basic/potentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/createFields.H
@@ -49,5 +49,5 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
index 3a72a378a..56145a53f 100644
--- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
+++ b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 
 #   include "CourantNo.H"
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index e3a5e8c1f..3d4311526 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -64,6 +64,7 @@ Description
 #include "ignition.H"
 #include "Switch.H"
 #include "bound.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -73,6 +74,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "readCombustionProperties.H"
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
@@ -90,7 +94,6 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
 #       include "readTimeControls.H"
-#       include "readPISOControls.H"
 #       include "CourantNo.H"
 #       include "setDeltaT.H"
 
@@ -102,7 +105,7 @@ int main(int argc, char *argv[])
 #       include "UEqn.H"
 
         // --- PISO loop
-        for (int corr=1; corr<=nCorr; corr++)
+        while (piso.correct())
         {
 #           include "bEqn.H"
 #           include "ftEqn.H"
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index fee3bd322..263e6b90b 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -66,6 +66,7 @@ Description
 #include "Switch.H"
 #include "bound.H"
 #include "dynamicRefineFvMesh.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -75,10 +76,12 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createDynamicFvMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "readCombustionProperties.H"
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
-#   include "readPISOControls.H"
 #   include "initContinuityErrs.H"
 #   include "createTimeControls.H"
 #   include "setInitialDeltaT.H"
@@ -92,7 +95,6 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
 #       include "readTimeControls.H"
-#       include "readPISOControls.H"
 #       include "CourantNo.H"
 
 #       include "setDeltaT.H"
@@ -168,7 +170,7 @@ int main(int argc, char *argv[])
 #       include "UEqn.H"
 
         // --- PISO loop
-        for (int corr=1; corr<=nCorr; corr++)
+        while (piso.correct())
         {
 #           include "bEqn.H"
 #           include "ftEqn.H"
diff --git a/applications/solvers/combustion/PDRFoam/UEqn.H b/applications/solvers/combustion/PDRFoam/UEqn.H
index aea6ad9a4..af2ea9510 100644
--- a/applications/solvers/combustion/PDRFoam/UEqn.H
+++ b/applications/solvers/combustion/PDRFoam/UEqn.H
@@ -9,7 +9,7 @@
 
     volSymmTensorField invA = inv(I*UEqn.A() + drag->Dcu());
 
-    if (momentumPredictor)
+    if (piso.momentumPredictor())
     {
         U = invA & (UEqn.H() - betav*fvc::grad(p));
         U.correctBoundaryConditions();
diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H
index 74a18ab6f..6d3a4bdf5 100644
--- a/applications/solvers/combustion/PDRFoam/createFields.H
+++ b/applications/solvers/combustion/PDRFoam/createFields.H
@@ -163,3 +163,5 @@
     fields.add(h);
     fields.add(hu);
     flameWrinkling->addXi(fields);
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/combustion/PDRFoam/pEqn.H b/applications/solvers/combustion/PDRFoam/pEqn.H
index 524c8eac7..250fdf2a0 100644
--- a/applications/solvers/combustion/PDRFoam/pEqn.H
+++ b/applications/solvers/combustion/PDRFoam/pEqn.H
@@ -3,7 +3,7 @@ rho = thermo.rho();
 volScalarField rUA = 1.0/UEqn.A();
 U = invA & UEqn.H();
 
-if (transonic)
+if (piso.transonic())
 {
     surfaceScalarField phid
     (
@@ -15,7 +15,7 @@ if (transonic)
         )
     );
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (piso.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -26,7 +26,7 @@ if (transonic)
 
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (piso.finalNonOrthogonalIter())
         {
             phi == pEqn.flux();
         }
@@ -41,7 +41,7 @@ else
           + fvc::ddtPhiCorr(rUA, rho, U, phi)
         );
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (piso.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -52,7 +52,7 @@ else
 
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (piso.finalNonOrthogonalIter())
         {
             phi += pEqn.flux();
         }
diff --git a/applications/solvers/combustion/rhoReactingFoam/UEqn.H b/applications/solvers/combustion/rhoReactingFoam/UEqn.H
index 9697c6e1e..1e626d75b 100644
--- a/applications/solvers/combustion/rhoReactingFoam/UEqn.H
+++ b/applications/solvers/combustion/rhoReactingFoam/UEqn.H
@@ -9,7 +9,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
     }
diff --git a/applications/solvers/combustion/rhoReactingFoam/createFields.H b/applications/solvers/combustion/rhoReactingFoam/createFields.H
index d4119b8c9..035d5a77b 100644
--- a/applications/solvers/combustion/rhoReactingFoam/createFields.H
+++ b/applications/solvers/combustion/rhoReactingFoam/createFields.H
@@ -97,3 +97,5 @@ DimensionedField<scalar, volMesh> chemistrySh
     mesh,
     dimensionedScalar("chemistrySh", dimEnergy/dimTime/dimVolume, 0.0)
 );
+
+mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/combustion/rhoReactingFoam/pEqn.H b/applications/solvers/combustion/rhoReactingFoam/pEqn.H
index 32653a927..222e8c959 100644
--- a/applications/solvers/combustion/rhoReactingFoam/pEqn.H
+++ b/applications/solvers/combustion/rhoReactingFoam/pEqn.H
@@ -8,7 +8,7 @@
     volScalarField rUA = 1.0/UEqn.A();
     U = rUA*UEqn.H();
 
-    if (transonic)
+    if (pimple.transonic())
     {
         surfaceScalarField phiv =
             (fvc::interpolate(U) & mesh.Sf())
@@ -22,7 +22,7 @@
             fvc::interpolate(thermo.psi())*phiv
         );
 
-        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+        while (pimple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
@@ -31,21 +31,12 @@
               - fvm::laplacian(rho*rUA, p)
             );
 
-            if
+            pEqn.solve
             (
-                ocorr == nOuterCorr
-             && corr == nCorr
-             && nonOrth == nNonOrthCorr
-            )
-            {
-                pEqn.solve(mesh.solutionDict().solver(p.name() + "Final"));
-            }
-            else
-            {
-                pEqn.solve();
-            }
+                mesh.solutionDict().solver(p.select(pimple.finalInnerIter()))
+            );
 
-            if (nonOrth == nNonOrthCorr)
+            if (pimple.finalNonOrthogonalIter())
             {
                 phi += pEqn.flux();
             }
@@ -60,7 +51,7 @@
               + fvc::ddtPhiCorr(rUA, rho, U, phi)
             );
 
-        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+        while (pimple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
@@ -69,21 +60,12 @@
               - fvm::laplacian(rho*rUA, p)
             );
 
-            if
+            pEqn.solve
             (
-                ocorr == nOuterCorr
-             && corr == nCorr
-             && nonOrth == nNonOrthCorr
-            )
-            {
-                pEqn.solve(mesh.solutionDict().solver(p.name() + "Final"));
-            }
-            else
-            {
-                pEqn.solve();
-            }
+                mesh.solutionDict().solver(p.select(pimple.finalInnerIter()))
+            );
 
-            if (nonOrth == nNonOrthCorr)
+            if (pimple.finalNonOrthogonalIter())
             {
                 phi += pEqn.flux();
             }
diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
index dc729c5f3..645d3a2cc 100644
--- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
@@ -36,6 +36,7 @@ Description
 #include "rhoChemistryModel.H"
 #include "chemistrySolver.H"
 #include "multivariateScheme.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,6 +45,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "readChemistryProperties.H"
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
@@ -59,7 +63,6 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
 #       include "readTimeControls.H"
-#       include "readPISOControls.H"
 #       include "compressibleCourantNo.H"
 #       include "setDeltaT.H"
 
@@ -69,14 +72,14 @@ int main(int argc, char *argv[])
 #       include "chemistry.H"
 #       include "rhoEqn.H"
 
-        for (label ocorr=1; ocorr <= nOuterCorr; ocorr++)
+        while (pimple.loop())
         {
 #           include "UEqn.H"
 #           include "YEqn.H"
 #           include "hsEqn.H"
 
             // --- PISO loop
-            for (int corr=1; corr<=nCorr; corr++)
+            while (pimple.correct())
             {
 #               include "pEqn.H"
             }
diff --git a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
index 734329af4..c34c947da 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
@@ -9,7 +9,7 @@ tmp<fvVectorMatrix> UEqn
 
 UEqn().relax
 (
-    mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter()))
+    mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()))
 );
 
 volScalarField rUA = 1.0/UEqn().A();
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index 20e25e948..13f306ddc 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@@ -39,10 +39,7 @@
 
 #   include "compressibleCreatePhi.H"
 
-    dimensionedScalar pMin
-    (
-        mesh.solutionDict().subDict("PIMPLE").lookup("pMin")
-    );
+    dimensionedScalar pMin(pimple.dict().lookup("pMin"));
 
     Info<< "Creating turbulence model\n" << endl;
     autoPtr<compressible::turbulenceModel> turbulence
diff --git a/applications/solvers/compressible/rhoPimpleFoam/hEqn.H b/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
index 60e38e90d..b0021019f 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
@@ -10,7 +10,7 @@
 
     hEqn.relax
     (
-        mesh.solutionDict().relaxationFactor(h.select(pimple.finalIter()))
+        mesh.solutionDict().equationRelaxationFactor(h.select(pimple.finalIter()))
     );
     hEqn.solve(mesh.solutionDict().solver((h.select(pimple.finalIter()))));
 
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index 836ce67aa..c2c0570c0 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -67,12 +67,6 @@ int main(int argc, char *argv[])
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        if (!pimple.firstIter())
-        {
-            p.storePrevIter();
-            rho.storePrevIter();
-        }
-
         #include "rhoEqn.H"
 
         // --- Pressure-velocity PIMPLE corrector loop
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H
index 3e1b83048..d51ba7546 100644
--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H
@@ -9,7 +9,7 @@ tmp<fvVectorMatrix> UEqn
 
 UEqn().relax
 (
-    mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter()))
+    mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()))
 );
 
 mrfZones.addCoriolis(rho, UEqn());
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/createFields.H
index b9a86ef99..325c8cbaa 100644
--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/createFields.H
@@ -39,10 +39,7 @@
 
     #include "compressibleCreatePhi.H"
 
-    dimensionedScalar pMin
-    (
-        mesh.solutionDict().subDict("PIMPLE").lookup("pMin")
-    );
+    dimensionedScalar pMin(pimple.dict().lookup("pMin"));
 
     Info<< "Creating turbulence model\n" << endl;
     autoPtr<compressible::turbulenceModel> turbulence
@@ -68,3 +65,5 @@
 
     porousZones pZones(mesh);
     Switch pressureImplicitPorosity(false);
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPorousSimpleFoam/UEqn.H
index 546094428..fd79c8400 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/UEqn.H
@@ -34,12 +34,7 @@
     {
         pZones.addResistance(UEqn());
 
-        eqnResidual = solve
-        (
-            UEqn() == -fvc::grad(p)
-        ). initialResidual();
-
-        maxResidual = max(eqnResidual, maxResidual);
+        solve(UEqn() == -fvc::grad(p));
 
         trAU = 1.0/UEqn().A();
         trAU().rename("rAU");
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/convergenceCheck.H b/applications/solvers/compressible/rhoPorousSimpleFoam/convergenceCheck.H
deleted file mode 100644
index 895806319..000000000
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/convergenceCheck.H
+++ /dev/null
@@ -1,9 +0,0 @@
-// check convergence
-
-if (maxResidual < convergenceCriterion)
-{
-    Info<< "reached convergence criterion: " << convergenceCriterion << endl;
-    runTime.writeAndEnd();
-    Info<< "latestTime = " << runTime.timeName() << endl;
-}
-
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
index 1177cba2a..65edfa008 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
@@ -43,12 +43,10 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
-    dimensionedScalar pMin
-    (
-        mesh.solutionDict().subDict("SIMPLE").lookup("pMin")
-    );
+    dimensionedScalar pMin(simple.dict().lookup("pMin"));
 
     Info<< "Creating turbulence model\n" << endl;
     autoPtr<compressible::RASModel> turbulence
@@ -71,12 +69,9 @@
     if (pZones.size())
     {
         // nUCorrectors for pressureImplicitPorosity
-        if (mesh.solutionDict().subDict("SIMPLE").found("nUCorrectors"))
+        if (simple.dict().found("nUCorrectors"))
         {
-            nUCorr = readInt
-            (
-                mesh.solutionDict().subDict("SIMPLE").lookup("nUCorrectors")
-            );
+            nUCorr = readInt(simple.dict().lookup("nUCorrectors"));
         }
 
         if (nUCorr > 0)
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H
index 605b8820d..324dcd642 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H
@@ -11,8 +11,7 @@
 
     hEqn.relax();
 
-    eqnResidual = hEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
+    hEqn.solve().initialResidual();
 
     thermo.correct();
 }
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/initConvergenceCheck.H b/applications/solvers/compressible/rhoPorousSimpleFoam/initConvergenceCheck.H
deleted file mode 100644
index b56197f22..000000000
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/initConvergenceCheck.H
+++ /dev/null
@@ -1,7 +0,0 @@
-// initialize values for convergence checks
-
-    scalar eqnResidual = 1, maxResidual = 0;
-    scalar convergenceCriterion = 0;
-
-    simple.readIfPresent("convergence", convergenceCriterion);
-
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H
index 4d8e010f7..ab81dac30 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H
@@ -12,7 +12,7 @@ UEqn.clear();
 phi = fvc::interpolate(rho*U) & mesh.Sf();
 bool closedVolume = adjustPhi(phi, U, p);
 
-for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+while (simple.correctNonOrthogonal())
 {
     tmp<fvScalarMatrix> tpEqn;
 
@@ -26,18 +26,10 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     }
 
     tpEqn().setReference(pRefCell, pRefValue);
-    // retain the residual from the first iteration
-    if (nonOrth == 0)
-    {
-        eqnResidual = tpEqn().solve().initialResidual();
-        maxResidual = max(eqnResidual, maxResidual);
-    }
-    else
-    {
-        tpEqn().solve();
-    }
 
-    if (nonOrth == nNonOrthCorr)
+    tpEqn().solve();
+
+    if (simple.finalNonOrthogonalIter())
     {
         phi -= tpEqn().flux();
     }
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index b72e7efd2..ad7422b1a 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
@@ -34,6 +34,7 @@ Description
 #include "basicPsiThermo.H"
 #include "RASModel.H"
 #include "porousZones.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -42,6 +43,9 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
+
+    simpleControl simple(mesh);
+
     #include "createFields.H"
     #include "initContinuityErrs.H"
 
@@ -49,16 +53,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        #include "readSIMPLEControls.H"
-        #include "initConvergenceCheck.H"
-
-        p.storePrevIter();
-        rho.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
             #include "UEqn.H"
@@ -72,8 +70,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-        #include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;
diff --git a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
index 401e1203d..21ec2646b 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
@@ -8,9 +8,4 @@
 
     UEqn().relax();
 
-    eqnResidual = solve
-    (
-        UEqn() == -fvc::grad(p)
-    ).initialResidual();
-
-    maxResidual = max(eqnResidual, maxResidual);
+    solve(UEqn() == -fvc::grad(p));
diff --git a/applications/solvers/compressible/rhoSimpleFoam/convergenceCheck.H b/applications/solvers/compressible/rhoSimpleFoam/convergenceCheck.H
deleted file mode 100644
index 895806319..000000000
--- a/applications/solvers/compressible/rhoSimpleFoam/convergenceCheck.H
+++ /dev/null
@@ -1,9 +0,0 @@
-// check convergence
-
-if (maxResidual < convergenceCriterion)
-{
-    Info<< "reached convergence criterion: " << convergenceCriterion << endl;
-    runTime.writeAndEnd();
-    Info<< "latestTime = " << runTime.timeName() << endl;
-}
-
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index 122280cfa..f335c6a6f 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -42,17 +42,11 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
-    dimensionedScalar rhoMax
-    (
-        mesh.solutionDict().subDict("SIMPLE").lookup("rhoMax")
-    );
-
-    dimensionedScalar rhoMin
-    (
-        mesh.solutionDict().subDict("SIMPLE").lookup("rhoMin")
-    );
+    dimensionedScalar rhoMax(simple.dict().lookup("rhoMax"));
+    dimensionedScalar rhoMin(simple.dict().lookup("rhoMin"));
 
     Info<< "Creating turbulence model\n" << endl;
     autoPtr<compressible::RASModel> turbulence
diff --git a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
index 57395e977..e6c74938e 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
@@ -11,8 +11,7 @@
 
     hEqn.relax();
 
-    eqnResidual = hEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
+    hEqn.solve();
 
     thermo.correct();
 }
diff --git a/applications/solvers/compressible/rhoSimpleFoam/initConvergenceCheck.H b/applications/solvers/compressible/rhoSimpleFoam/initConvergenceCheck.H
deleted file mode 100644
index b56197f22..000000000
--- a/applications/solvers/compressible/rhoSimpleFoam/initConvergenceCheck.H
+++ /dev/null
@@ -1,7 +0,0 @@
-// initialize values for convergence checks
-
-    scalar eqnResidual = 1, maxResidual = 0;
-    scalar convergenceCriterion = 0;
-
-    simple.readIfPresent("convergence", convergenceCriterion);
-
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index 04af6df75..3865aeb9f 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -9,7 +9,7 @@ UEqn.clear();
 
 bool closedVolume = false;
 
-if (transonic)
+if (simple.transonic())
 {
     surfaceScalarField phid
     (
@@ -17,7 +17,7 @@ if (transonic)
         fvc::interpolate(psi)*(fvc::interpolate(U) & mesh.Sf())
     );
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (simple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -26,22 +26,13 @@ if (transonic)
         );
 
         // Relax the pressure equation to ensure diagonal-dominance
-        pEqn.relax(mesh.solutionDict().relaxationFactor("pEqn"));
+        pEqn.relax();
 
         pEqn.setReference(pRefCell, pRefValue);
 
-        // retain the residual from the first iteration
-        if (nonOrth == 0)
-        {
-            eqnResidual = pEqn.solve().initialResidual();
-            maxResidual = max(eqnResidual, maxResidual);
-        }
-        else
-        {
-            pEqn.solve();
-        }
+        pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (simple.finalNonOrthogonalIter())
         {
             phi == pEqn.flux();
         }
@@ -52,7 +43,7 @@ else
     phi = fvc::interpolate(rho)*(fvc::interpolate(U) & mesh.Sf());
     closedVolume = adjustPhi(phi, U, p);
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (simple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -61,18 +52,9 @@ else
 
         pEqn.setReference(pRefCell, pRefValue);
 
-        // Retain the residual from the first iteration
-        if (nonOrth == 0)
-        {
-            eqnResidual = pEqn.solve().initialResidual();
-            maxResidual = max(eqnResidual, maxResidual);
-        }
-        else
-        {
-            pEqn.solve();
-        }
+        pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (simple.finalNonOrthogonalIter())
         {
             phi -= pEqn.flux();
         }
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index 6c63d09c0..afa315bed 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@@ -33,6 +33,7 @@ Description
 #include "fvCFD.H"
 #include "basicPsiThermo.H"
 #include "RASModel.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -41,6 +42,9 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
+
+    simpleControl simple(mesh);
+
     #include "createFields.H"
     #include "initContinuityErrs.H"
 
@@ -48,16 +52,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readSIMPLEControls.H"
-#       include "initConvergenceCheck.H"
-
-        p.storePrevIter();
-        rho.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
 #           include "UEqn.H"
@@ -72,8 +70,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-        #include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;
diff --git a/applications/solvers/compressible/rhoSonicFoam/createFields.H b/applications/solvers/compressible/rhoSonicFoam/createFields.H
index f0c0e4a22..aa121b96e 100644
--- a/applications/solvers/compressible/rhoSonicFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSonicFoam/createFields.H
@@ -94,3 +94,5 @@
         rho*Cv*T + 0.5*rho*magSqr(rhoU/rho),
         T.boundaryField().types()
     );
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/compressible/rhopSonicFoam/createFields.H b/applications/solvers/compressible/rhopSonicFoam/createFields.H
index fed843271..c8e478e88 100644
--- a/applications/solvers/compressible/rhopSonicFoam/createFields.H
+++ b/applications/solvers/compressible/rhopSonicFoam/createFields.H
@@ -127,3 +127,4 @@
     fields.add(magRhoU);
     fields.add(H);
 
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
index 9551a2778..8fd9c00d6 100644
--- a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
+++ b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
@@ -36,6 +36,7 @@ Description
 #include "MUSCL.H"
 #include "LimitedScheme.H"
 #include "boundaryTypes.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,6 +46,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "readThermodynamicProperties.H"
 #   include "createFields.H"
 #   include "createTimeControls.H"
@@ -57,8 +61,7 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.value() << nl << endl;
 
-#       include "readPISOControls.H"
-        scalar HbyAblend = readScalar(piso.lookup("HbyAblend"));
+        scalar HbyAblend = readScalar(pimple.dict().lookup("HbyAblend"));
 
 #       include "readTimeControls.H"
 
@@ -72,7 +75,7 @@ int main(int argc, char *argv[])
 
 #       include "setDeltaT.H"
 
-        for (int outerCorr = 0; outerCorr < nOuterCorr; outerCorr++)
+        while (pimple.loop())
         {
             magRhoU = mag(rhoU);
             H = (rhoE + p)/rho;
@@ -118,7 +121,7 @@ int main(int argc, char *argv[])
             psi = 1.0/(R*T);
             p = rho/psi;
 
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
                 volScalarField rrhoUA = 1.0/rhoUEqn.A();
                 surfaceScalarField rrhoUAf("rrhoUAf", fvc::interpolate(rrhoUA));
diff --git a/applications/solvers/compressible/sonicDyMFoam/UEqn.H b/applications/solvers/compressible/sonicDyMFoam/UEqn.H
index 377aa0a13..9d9beaccb 100644
--- a/applications/solvers/compressible/sonicDyMFoam/UEqn.H
+++ b/applications/solvers/compressible/sonicDyMFoam/UEqn.H
@@ -5,20 +5,9 @@
       + turbulence->divDevRhoReff(U)
     );
 
-    if (oCorr == nOuterCorr - 1)
-    {
-        if (mesh.solutionDict().relax("UFinal"))
-        {
-            UEqn.relax(mesh.solutionDict().relaxationFactor("UFinal"));
-        }
-        else
-        {
-            UEqn.relax(1);
-        }
-    }
-    else
-    {
-        UEqn.relax();
-    }
+    UEqn.relax
+    (
+        mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()))
+    );
 
     solve(UEqn == -fvc::grad(p));
diff --git a/applications/solvers/compressible/sonicDyMFoam/createControls.H b/applications/solvers/compressible/sonicDyMFoam/createControls.H
index 45a18790e..a9c1b9b0a 100644
--- a/applications/solvers/compressible/sonicDyMFoam/createControls.H
+++ b/applications/solvers/compressible/sonicDyMFoam/createControls.H
@@ -1,14 +1,11 @@
 #   include "createTimeControls.H"
-#   include "readPIMPLEControls.H"
 
-    bool correctPhi = false;
-    if (pimple.found("correctPhi"))
-    {
-        correctPhi = Switch(pimple.lookup("correctPhi"));
-    }
+bool correctPhi
+(
+    pimple.dict().lookupOrDefault("correctPhi", false)
+);
 
-    bool checkMeshCourantNo = false;
-    if (pimple.found("checkMeshCourantNo"))
-    {
-        checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo"));
-    }
+bool checkMeshCourantNo
+(
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
+);
diff --git a/applications/solvers/compressible/sonicDyMFoam/createFields.H b/applications/solvers/compressible/sonicDyMFoam/createFields.H
index a17764ce4..0bec8c245 100644
--- a/applications/solvers/compressible/sonicDyMFoam/createFields.H
+++ b/applications/solvers/compressible/sonicDyMFoam/createFields.H
@@ -51,3 +51,5 @@
             thermo
         )
     );
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/compressible/sonicDyMFoam/eEqn.H b/applications/solvers/compressible/sonicDyMFoam/eEqn.H
index 5a4596437..c2e5f375c 100644
--- a/applications/solvers/compressible/sonicDyMFoam/eEqn.H
+++ b/applications/solvers/compressible/sonicDyMFoam/eEqn.H
@@ -17,21 +17,10 @@
         // viscous heating?
     );
 
-    if (oCorr == nOuterCorr - 1)
-    {
-        if (mesh.solutionDict().relax("eFinal"))
-        {
-            eEqn.relax(mesh.solutionDict().relaxationFactor("eFinal"));
-        }
-        else
-        {
-            eEqn.relax(1);
-        }
-    }
-    else
-    {
-        eEqn.relax();
-    }
+    eEqn.relax
+    (
+        mesh.solutionDict().equationRelaxationFactor(e.select(pimple.finalIter()))
+    );
 
     eEqn.solve();
 
diff --git a/applications/solvers/compressible/sonicDyMFoam/pEqn.H b/applications/solvers/compressible/sonicDyMFoam/pEqn.H
index 1be1b12b2..20cb4ea4c 100644
--- a/applications/solvers/compressible/sonicDyMFoam/pEqn.H
+++ b/applications/solvers/compressible/sonicDyMFoam/pEqn.H
@@ -3,7 +3,7 @@
 
 #   include "limitU.H"
 
-    for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         // Calculate phi for boundary conditions
         phi = rhof*
@@ -36,25 +36,13 @@
           - fvm::laplacian(rho*rUA, p)
         );
 
-        if
+        pEqn.solve
         (
-//              oCorr == nOuterCorr - 1
-            corr == nCorr - 1
-         && nonOrth == nNonOrthCorr
-        )
-        {
-            pEqn.solve
-            (
-                mesh.solutionDict().solver(p.name() + "Final")
-            );
-        }
-        else
-        {
-            pEqn.solve(mesh.solutionDict().solver(p.name()));
-        }
+            mesh.solutionDict().solver(p.select(pimple.finalInnerIter()))
+        );
 
         // Calculate the flux
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi = phid2 + pEqn.flux();
         }
diff --git a/applications/solvers/compressible/sonicDyMFoam/readControls.H b/applications/solvers/compressible/sonicDyMFoam/readControls.H
index 2db7f5142..9f982e260 100644
--- a/applications/solvers/compressible/sonicDyMFoam/readControls.H
+++ b/applications/solvers/compressible/sonicDyMFoam/readControls.H
@@ -1,14 +1,5 @@
-#   include "readTimeControls.H"
-#   include "readPIMPLEControls.H"
+#include "readTimeControls.H"
 
-    correctPhi = false;
-    if (pimple.found("correctPhi"))
-    {
-        correctPhi = Switch(pimple.lookup("correctPhi"));
-    }
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", false);
 
-    checkMeshCourantNo = false;
-    if (pimple.found("checkMeshCourantNo"))
-    {
-        checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo"));
-    }
+checkMeshCourantNo = pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
diff --git a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
index 0920a9542..d8e9c123f 100644
--- a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
@@ -47,6 +47,7 @@ Author
 #include "specie.H"
 #include "basicPsiThermo.H"
 #include "turbulenceModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -56,6 +57,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createDynamicFvMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 #   include "createControls.H"
@@ -106,8 +110,7 @@ int main(int argc, char *argv[])
         }
 
         // --- PIMPLE loop
-        label oCorr = 0;
-        do
+        while (pimple.loop())
         {
 #           include "rhoEqn.H"
 #           include "eEqn.H"
@@ -123,13 +126,13 @@ int main(int argc, char *argv[])
             // but psi and rho are not
             surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p);
 
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
 #               include "pEqn.H"
             }
 
             turbulence->correct();
-        } while (++oCorr < nOuterCorr);
+        }
 
         runTime.write();
 
diff --git a/applications/solvers/compressible/sonicFoam/UEqn.H b/applications/solvers/compressible/sonicFoam/UEqn.H
index 377aa0a13..9d9beaccb 100644
--- a/applications/solvers/compressible/sonicFoam/UEqn.H
+++ b/applications/solvers/compressible/sonicFoam/UEqn.H
@@ -5,20 +5,9 @@
       + turbulence->divDevRhoReff(U)
     );
 
-    if (oCorr == nOuterCorr - 1)
-    {
-        if (mesh.solutionDict().relax("UFinal"))
-        {
-            UEqn.relax(mesh.solutionDict().relaxationFactor("UFinal"));
-        }
-        else
-        {
-            UEqn.relax(1);
-        }
-    }
-    else
-    {
-        UEqn.relax();
-    }
+    UEqn.relax
+    (
+        mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()))
+    );
 
     solve(UEqn == -fvc::grad(p));
diff --git a/applications/solvers/compressible/sonicFoam/createFields.H b/applications/solvers/compressible/sonicFoam/createFields.H
index 8e03212c2..e88da74d3 100644
--- a/applications/solvers/compressible/sonicFoam/createFields.H
+++ b/applications/solvers/compressible/sonicFoam/createFields.H
@@ -50,3 +50,5 @@
             thermo
         )
     );
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/compressible/sonicFoam/eEqn.H b/applications/solvers/compressible/sonicFoam/eEqn.H
index 3f9cc4184..9f1cbe174 100644
--- a/applications/solvers/compressible/sonicFoam/eEqn.H
+++ b/applications/solvers/compressible/sonicFoam/eEqn.H
@@ -14,21 +14,10 @@
         // viscous heating?
     );
 
-    if (oCorr == nOuterCorr - 1)
-    {
-        if (mesh.solutionDict().relax("eFinal"))
-        {
-            eEqn.relax(mesh.solutionDict().relaxationFactor("eFinal"));
-        }
-        else
-        {
-            eEqn.relax(1);
-        }
-    }
-    else
-    {
-        eEqn.relax();
-    }
+    eEqn.relax
+    (
+        mesh.solutionDict().equationRelaxationFactor(e.select(pimple.finalIter()))
+    );
 
     eEqn.solve();
 
diff --git a/applications/solvers/compressible/sonicFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/pEqn.H
index 2a53cc3ec..686acebaa 100644
--- a/applications/solvers/compressible/sonicFoam/pEqn.H
+++ b/applications/solvers/compressible/sonicFoam/pEqn.H
@@ -1,7 +1,7 @@
 {
     U = UEqn.H()/UEqn.A();
 
-    for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         // Calculate phi for boundary conditions
         phi = rhof*
@@ -36,7 +36,7 @@
         pEqn.solve();
 
         // Calculate the flux
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi = phid2 + pEqn.flux();
         }
diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C
index fb11a64bc..9085439ee 100644
--- a/applications/solvers/compressible/sonicFoam/sonicFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C
@@ -42,6 +42,7 @@ Author
 #include "fvCFD.H"
 #include "basicPsiThermo.H"
 #include "turbulenceModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,6 +51,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 #   include "createTimeControls.H"
@@ -61,7 +65,6 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
 #       include "readTimeControls.H"
-#       include "readPIMPLEControls.H"
 #       include "compressibleCourantNo.H"
 #       include "setDeltaT.H"
 
@@ -70,8 +73,7 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         // --- PIMPLE loop
-        label oCorr = 0;
-        do
+        while (pimple.loop())
         {
 #           include "rhoEqn.H"
 #           include "eEqn.H"
@@ -87,13 +89,13 @@ int main(int argc, char *argv[])
             // but psi and rho are not
             surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p);
 
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
 #               include "pEqn.H"
             }
 
             turbulence->correct();
-        } while (++oCorr < nOuterCorr);
+        }
 
         runTime.write();
 
diff --git a/applications/solvers/compressible/sonicLiquidFoam/compressibleContinuityErrs.H b/applications/solvers/compressible/sonicLiquidFoam/compressibleContinuityErrs.H
index 9851dfb7a..313cf3272 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/compressibleContinuityErrs.H
+++ b/applications/solvers/compressible/sonicLiquidFoam/compressibleContinuityErrs.H
@@ -1,8 +1,8 @@
 {
-    scalar sumLocalContErr =
+    sumLocalContErr =
         (sum(mag(rho - rho0 - psi*(p - p0)))/sum(rho)).value();
 
-    scalar globalContErr = (sum(rho - rho0 - psi*(p - p0))/sum(rho)).value();
+    globalContErr = (sum(rho - rho0 - psi*(p - p0))/sum(rho)).value();
 
     cumulativeContErr += globalContErr;
 
diff --git a/applications/solvers/compressible/sonicLiquidFoam/createFields.H b/applications/solvers/compressible/sonicLiquidFoam/createFields.H
index f419234c7..cf3dce8f8 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/createFields.H
+++ b/applications/solvers/compressible/sonicLiquidFoam/createFields.H
@@ -42,3 +42,5 @@
 
 
 #   include "compressibleCreatePhi.H"
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
index 66df9e7df..259dc677a 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
+++ b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
@@ -31,6 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,6 +40,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "readThermodynamicProperties.H"
 #   include "readTransportProperties.H"
 #   include "createFields.H"
@@ -52,14 +56,12 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPIMPLEControls.H"
 #       include "compressibleCourantNo.H"
 
 #       include "rhoEqn.H"
 
         // --- PIMPLE loop
-        label oCorr = 0;
-        do
+        while (pimple.loop())
         {
             fvVectorMatrix UEqn
             (
@@ -71,7 +73,7 @@ int main(int argc, char *argv[])
             solve(UEqn == -fvc::grad(p));
 
             // --- PISO loop
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
                 volScalarField rAU("rAU", 1.0/UEqn.A());
                 surfaceScalarField rhorAUf
@@ -113,7 +115,7 @@ int main(int argc, char *argv[])
                 U -= rAU*fvc::grad(p);
                 U.correctBoundaryConditions();
             }
-        } while (++oCorr < nOuterCorr);
+        }
 
 
         // Correct density
diff --git a/applications/solvers/compressible/steadyCompressibleFoam/UEqn.H b/applications/solvers/compressible/steadyCompressibleFoam/UEqn.H
index 4e2e22af0..204c349fb 100644
--- a/applications/solvers/compressible/steadyCompressibleFoam/UEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleFoam/UEqn.H
@@ -10,9 +10,4 @@
 
     UEqn.relax();
 
-    eqnResidual = solve
-    (
-        UEqn == -fvc::grad(p)
-    ).initialResidual();
-
-    maxResidual = max(eqnResidual, maxResidual);
+    solve(UEqn == -fvc::grad(p));
diff --git a/applications/solvers/compressible/steadyCompressibleFoam/convergenceCheck.H b/applications/solvers/compressible/steadyCompressibleFoam/convergenceCheck.H
deleted file mode 100644
index 895806319..000000000
--- a/applications/solvers/compressible/steadyCompressibleFoam/convergenceCheck.H
+++ /dev/null
@@ -1,9 +0,0 @@
-// check convergence
-
-if (maxResidual < convergenceCriterion)
-{
-    Info<< "reached convergence criterion: " << convergenceCriterion << endl;
-    runTime.writeAndEnd();
-    Info<< "latestTime = " << runTime.timeName() << endl;
-}
-
diff --git a/applications/solvers/compressible/steadyCompressibleFoam/createFields.H b/applications/solvers/compressible/steadyCompressibleFoam/createFields.H
index e5329725d..daead2e3d 100644
--- a/applications/solvers/compressible/steadyCompressibleFoam/createFields.H
+++ b/applications/solvers/compressible/steadyCompressibleFoam/createFields.H
@@ -60,3 +60,5 @@
             thermo
         )
     );
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H b/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H
index 728fdb6da..c93a3b888 100644
--- a/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H
@@ -17,8 +17,7 @@
 
     hEqn.relax();
 
-    eqnResidual = hEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
+    hEqn.solve();
 
     // Bounding of enthalpy taken out
     thermo.correct();
diff --git a/applications/solvers/compressible/steadyCompressibleFoam/initConvergenceCheck.H b/applications/solvers/compressible/steadyCompressibleFoam/initConvergenceCheck.H
deleted file mode 100644
index 47a1852f0..000000000
--- a/applications/solvers/compressible/steadyCompressibleFoam/initConvergenceCheck.H
+++ /dev/null
@@ -1,7 +0,0 @@
-// initialize values for convergence checks
-
-    scalar eqnResidual = 1, maxResidual = 0;
-    scalar convergenceCriterion = 0;
-
-    pimple.readIfPresent("convergence", convergenceCriterion);
-
diff --git a/applications/solvers/compressible/steadyCompressibleFoam/pEqn.H b/applications/solvers/compressible/steadyCompressibleFoam/pEqn.H
index 5736d3d6f..2a46da754 100644
--- a/applications/solvers/compressible/steadyCompressibleFoam/pEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleFoam/pEqn.H
@@ -4,11 +4,11 @@
     surfaceScalarField psisf = fvc::interpolate(psis);
     surfaceScalarField rhof = fvc::interpolate(rho);
 
-    // Needs to be outside of loop since p is changing, but psi and rho are not
+    // Needs to be outside of loop since p is changing, but psi and rho are not.
     surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p);
 
     // --- PISO loop
-    for (int corr = 0; corr < nCorr; corr++)
+    while (pimple.correct())
     {
         U = rUA*UEqn.H();
 
@@ -27,7 +27,7 @@
             fvc::div(phid)
         );
 
-        for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+        while (pimple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
@@ -40,16 +40,10 @@
               - fvm::laplacian(rho*rUA, p)
             );
 
-            // Retain the residual from the first pressure solution
-            eqnResidual = pEqn.solve().initialResidual();
-
-            if (corr == 0 && nonOrth == 0)
-            {
-                maxResidual = max(eqnResidual, maxResidual);
-            }
+            pEqn.solve();
 
             // Calculate the flux
-            if (nonOrth == nNonOrthCorr)
+            if (pimple.finalNonOrthogonalIter())
             {
                 phi = phid2 + pEqn.flux();
             }
diff --git a/applications/solvers/compressible/steadyCompressibleFoam/steadyCompressibleFoam.C b/applications/solvers/compressible/steadyCompressibleFoam/steadyCompressibleFoam.C
index e1d2c9732..4fcdd878e 100644
--- a/applications/solvers/compressible/steadyCompressibleFoam/steadyCompressibleFoam.C
+++ b/applications/solvers/compressible/steadyCompressibleFoam/steadyCompressibleFoam.C
@@ -35,6 +35,7 @@ Author
 #include "fvCFD.H"
 #include "basicPsiThermo.H"
 #include "RASModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,8 +46,10 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "createFields.H"
-#   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,11 +60,8 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPIMPLEControls.H"
 #       include "readFieldBounds.H"
 
-#       include "initConvergenceCheck.H"
-
 #       include "UEqn.H"
 #       include "pEqn.H"
 
@@ -77,8 +77,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-#       include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;
diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/UEqn.H b/applications/solvers/compressible/steadyCompressibleMRFFoam/UEqn.H
index 1c39c948b..f1c57b01d 100644
--- a/applications/solvers/compressible/steadyCompressibleMRFFoam/UEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/UEqn.H
@@ -13,9 +13,4 @@
 
     UEqn.relax();
 
-    eqnResidual = solve
-    (
-        UEqn == -fvc::grad(p)
-    ).initialResidual();
-
-    maxResidual = max(eqnResidual, maxResidual);
+    solve(UEqn == -fvc::grad(p));
diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/convergenceCheck.H b/applications/solvers/compressible/steadyCompressibleMRFFoam/convergenceCheck.H
deleted file mode 100644
index 895806319..000000000
--- a/applications/solvers/compressible/steadyCompressibleMRFFoam/convergenceCheck.H
+++ /dev/null
@@ -1,9 +0,0 @@
-// check convergence
-
-if (maxResidual < convergenceCriterion)
-{
-    Info<< "reached convergence criterion: " << convergenceCriterion << endl;
-    runTime.writeAndEnd();
-    Info<< "latestTime = " << runTime.timeName() << endl;
-}
-
diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/createFields.H b/applications/solvers/compressible/steadyCompressibleMRFFoam/createFields.H
index 6b466f155..7dc807fd1 100644
--- a/applications/solvers/compressible/steadyCompressibleMRFFoam/createFields.H
+++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/createFields.H
@@ -101,3 +101,5 @@
         h
     );
     i == h - 0.5*(magSqr(Urot) - magSqr(Urel));
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/hEqn.H b/applications/solvers/compressible/steadyCompressibleMRFFoam/hEqn.H
index 6bf1b5f52..3aebca26b 100644
--- a/applications/solvers/compressible/steadyCompressibleMRFFoam/hEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/hEqn.H
@@ -25,9 +25,6 @@
 
     hEqn.relax();
 
-    eqnResidual = hEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
-
     // Bounding of enthalpy taken out
     thermo.correct();
     psis = thermo.psi()/thermo.Cp()*thermo.Cv();
diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/iEqn.H b/applications/solvers/compressible/steadyCompressibleMRFFoam/iEqn.H
index d3d754972..2fa37cfcc 100644
--- a/applications/solvers/compressible/steadyCompressibleMRFFoam/iEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/iEqn.H
@@ -20,8 +20,7 @@
 
     iEqn.relax();
 
-    eqnResidual = iEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
+    iEqn.solve();
 
     // Calculate enthalpy out of rothalpy
     h = i + 0.5*(magSqr(Urot) - magSqr(Urel));
diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/initConvergenceCheck.H b/applications/solvers/compressible/steadyCompressibleMRFFoam/initConvergenceCheck.H
deleted file mode 100644
index 47a1852f0..000000000
--- a/applications/solvers/compressible/steadyCompressibleMRFFoam/initConvergenceCheck.H
+++ /dev/null
@@ -1,7 +0,0 @@
-// initialize values for convergence checks
-
-    scalar eqnResidual = 1, maxResidual = 0;
-    scalar convergenceCriterion = 0;
-
-    pimple.readIfPresent("convergence", convergenceCriterion);
-
diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/pEqn.H b/applications/solvers/compressible/steadyCompressibleMRFFoam/pEqn.H
index f66193394..ff35bebaa 100644
--- a/applications/solvers/compressible/steadyCompressibleMRFFoam/pEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/pEqn.H
@@ -4,11 +4,11 @@
     surfaceScalarField psisf = fvc::interpolate(psis);
     surfaceScalarField rhof = fvc::interpolate(rho);
 
-    // Needs to be outside of loop since p is changing, but psi and rho are not
+    // Needs to be outside of loop since p is changing, but psi and rho are not.
     surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p);
 
     // --- PISO loop
-    for (int corr = 0; corr < nCorr; corr++)
+    while (pimple.correct())
     {
         U = rUA*UEqn.H();
 
@@ -32,7 +32,7 @@
             fvc::div(phid)
         );
 
-        for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+        while (pimple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
@@ -45,16 +45,10 @@
               - fvm::laplacian(rho*rUA, p)
             );
 
-            // Retain the residual from the first pressure solution
-            eqnResidual = pEqn.solve().initialResidual();
-
-            if (corr == 0 && nonOrth == 0)
-            {
-                maxResidual = max(eqnResidual, maxResidual);
-            }
+            pEqn.solve();
 
             // Calculate the flux
-            if (nonOrth == nNonOrthCorr)
+            if (pimple.finalNonOrthogonalIter())
             {
                 phi = phid2 + pEqn.flux();
             }
diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/steadyCompressibleMRFFoam.C b/applications/solvers/compressible/steadyCompressibleMRFFoam/steadyCompressibleMRFFoam.C
index 1ec4bd8c8..84337526b 100644
--- a/applications/solvers/compressible/steadyCompressibleMRFFoam/steadyCompressibleMRFFoam.C
+++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/steadyCompressibleMRFFoam.C
@@ -37,6 +37,7 @@ Author
 #include "basicPsiThermo.H"
 #include "RASModel.H"
 #include "MRFZones.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -47,8 +48,10 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "createFields.H"
-#   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,11 +62,8 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPIMPLEControls.H"
 #       include "readFieldBounds.H"
 
-#       include "initConvergenceCheck.H"
-
 #       include "UEqn.H"
 #       include "pEqn.H"
 
@@ -81,8 +81,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-#       include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;
diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/UEqn.H b/applications/solvers/compressible/steadyCompressibleSRFFoam/UEqn.H
index 334595328..79e6bc93c 100644
--- a/applications/solvers/compressible/steadyCompressibleSRFFoam/UEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/UEqn.H
@@ -11,9 +11,4 @@
 
     UrelEqn.relax();
 
-    eqnResidual = solve
-    (
-        UrelEqn == -fvc::grad(p)
-    ).initialResidual();
-
-    maxResidual = max(eqnResidual, maxResidual);
+    solve(UrelEqn == -fvc::grad(p));
diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/convergenceCheck.H b/applications/solvers/compressible/steadyCompressibleSRFFoam/convergenceCheck.H
deleted file mode 100644
index 895806319..000000000
--- a/applications/solvers/compressible/steadyCompressibleSRFFoam/convergenceCheck.H
+++ /dev/null
@@ -1,9 +0,0 @@
-// check convergence
-
-if (maxResidual < convergenceCriterion)
-{
-    Info<< "reached convergence criterion: " << convergenceCriterion << endl;
-    runTime.writeAndEnd();
-    Info<< "latestTime = " << runTime.timeName() << endl;
-}
-
diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/createFields.H b/applications/solvers/compressible/steadyCompressibleSRFFoam/createFields.H
index 8ed2f88c5..bf7075ae4 100644
--- a/applications/solvers/compressible/steadyCompressibleSRFFoam/createFields.H
+++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/createFields.H
@@ -104,3 +104,5 @@
         h
     );
     i == h - 0.5*(magSqr(Urot) - magSqr(Urel));
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/iEqn.H b/applications/solvers/compressible/steadyCompressibleSRFFoam/iEqn.H
index de48d20d6..c37796f06 100644
--- a/applications/solvers/compressible/steadyCompressibleSRFFoam/iEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/iEqn.H
@@ -13,8 +13,7 @@
 
     iEqn.relax();
 
-    eqnResidual = iEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
+    iEqn.solve();
 
     // Calculate enthalpy out of rothalpy
     h = i + 0.5*(magSqr(Urot) - magSqr(Urel));
diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/initConvergenceCheck.H b/applications/solvers/compressible/steadyCompressibleSRFFoam/initConvergenceCheck.H
deleted file mode 100644
index 47a1852f0..000000000
--- a/applications/solvers/compressible/steadyCompressibleSRFFoam/initConvergenceCheck.H
+++ /dev/null
@@ -1,7 +0,0 @@
-// initialize values for convergence checks
-
-    scalar eqnResidual = 1, maxResidual = 0;
-    scalar convergenceCriterion = 0;
-
-    pimple.readIfPresent("convergence", convergenceCriterion);
-
diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/pEqn.H b/applications/solvers/compressible/steadyCompressibleSRFFoam/pEqn.H
index f4429ad0f..59e03e2c4 100644
--- a/applications/solvers/compressible/steadyCompressibleSRFFoam/pEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/pEqn.H
@@ -4,11 +4,10 @@
     surfaceScalarField psisf = fvc::interpolate(psis);
     surfaceScalarField rhof = fvc::interpolate(rho);
 
-    // Needs to be outside of loop since p is changing, but psi and rho are not
+    // Needs to be outside of loop since p is changing, but psi and rho are not.
     surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p);
 
-    // --- PISO loop
-    for (int corr = 0; corr < nCorr; corr++)
+    while (pimple.correct())
     {
         Urel = rUrelA*UrelEqn.H();
 
@@ -27,7 +26,7 @@
             fvc::div(phid)
         );
 
-        for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+        while (pimple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
@@ -40,16 +39,10 @@
               - fvm::laplacian(rho*rUrelA, p)
             );
 
-            // Retain the residual from the first pressure solution
-            eqnResidual = pEqn.solve().initialResidual();
-
-            if (corr == 0 && nonOrth == 0)
-            {
-                maxResidual = max(eqnResidual, maxResidual);
-            }
+            pEqn.solve();
 
             // Calculate the flux
-            if (nonOrth == nNonOrthCorr)
+            if (pimple.finalNonOrthogonalIter())
             {
                 phi = phid2 + pEqn.flux();
             }
diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/steadyCompressibleSRFFoam.C b/applications/solvers/compressible/steadyCompressibleSRFFoam/steadyCompressibleSRFFoam.C
index 86957b3bf..de683db1b 100644
--- a/applications/solvers/compressible/steadyCompressibleSRFFoam/steadyCompressibleSRFFoam.C
+++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/steadyCompressibleSRFFoam.C
@@ -37,6 +37,7 @@ Author
 #include "basicPsiThermo.H"
 #include "RASModel.H"
 #include "SRFModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -47,8 +48,10 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "createFields.H"
-#   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,11 +62,8 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPIMPLEControls.H"
 #       include "readFieldBounds.H"
 
-#       include "initConvergenceCheck.H"
-
 #       include "UEqn.H"
 #       include "pEqn.H"
 
@@ -87,8 +87,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-#       include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;
diff --git a/applications/solvers/coupled/MRFPorousFoam/createFields.H b/applications/solvers/coupled/MRFPorousFoam/createFields.H
index d06ae12d7..7a3ee5372 100644
--- a/applications/solvers/coupled/MRFPorousFoam/createFields.H
+++ b/applications/solvers/coupled/MRFPorousFoam/createFields.H
@@ -56,3 +56,5 @@ Info<< "Creating field rAU\n" << endl;
 // will be used.  HJ, 1/Mar/2016
 tmp<volScalarField> trAU;
 tmp<volTensorField> trTU;
+
+mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/coupled/blockCoupledScalarTransportFoam/blockCoupledScalarTransportFoam.C b/applications/solvers/coupled/blockCoupledScalarTransportFoam/blockCoupledScalarTransportFoam.C
index 413ee4e5a..66a486307 100644
--- a/applications/solvers/coupled/blockCoupledScalarTransportFoam/blockCoupledScalarTransportFoam.C
+++ b/applications/solvers/coupled/blockCoupledScalarTransportFoam/blockCoupledScalarTransportFoam.C
@@ -39,7 +39,7 @@ Description
 #include "foamTime.H"
 #include "fvMesh.H"
 #include "fvBlockMatrix.H"
-
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,6 +49,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    simpleControl simple(mesh);
+
 #   include "createFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,13 +60,11 @@ int main(int argc, char *argv[])
 
 #   include "CourantNo.H"
 
-    for (runTime++; !runTime.end(); runTime++)
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readSIMPLEControls.H"
-
-        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+        while (simple.correctNonOrthogonal())
         {
             fvScalarMatrix TEqn
             (
diff --git a/applications/solvers/coupled/conjugateHeatFoam/UEqn.H b/applications/solvers/coupled/conjugateHeatFoam/UEqn.H
index df6f90ac0..10aeeb0c6 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/UEqn.H
+++ b/applications/solvers/coupled/conjugateHeatFoam/UEqn.H
@@ -9,7 +9,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (piso.momentumPredictor())
     {
         solve
         (
diff --git a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatFoam.C b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatFoam.C
index 8fe806845..3f8e90dac 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatFoam.C
+++ b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatFoam.C
@@ -38,6 +38,8 @@ Description
 #include "thermalModel.H"
 #include "singlePhaseTransportModel.H"
 #include "RASModel.H"
+#include "pisoControl.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -47,6 +49,9 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createFluidMesh.H"
 #   include "createSolidMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "createSolidFields.H"
@@ -64,7 +69,6 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readTimeControls.H"
-#       include "readPISOControls.H"
 #       include "CourantNo.H"
 #       include "setDeltaT.H"
 
@@ -75,7 +79,7 @@ int main(int argc, char *argv[])
 
         p_rgh.storePrevIter();
 
-        for (int corr = 0; corr < nCorr; corr++)
+        while (piso.correct())
         {
 #           include "pEqn.H"
         }
diff --git a/applications/solvers/coupled/conjugateHeatFoam/createFields.H b/applications/solvers/coupled/conjugateHeatFoam/createFields.H
index 720ef6deb..d04677e18 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/createFields.H
+++ b/applications/solvers/coupled/conjugateHeatFoam/createFields.H
@@ -64,13 +64,8 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell
-    (
-        p_rgh,
-        mesh.solutionDict().subDict("PISO"),
-        pRefCell,
-        pRefValue
-    );
+    setRefCell(p_rgh, piso.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p_rgh.name());
 
     autoPtr<incompressible::RASModel> turbulence
     (
diff --git a/applications/solvers/coupled/conjugateHeatFoam/initConvergenceCheck.H b/applications/solvers/coupled/conjugateHeatFoam/initConvergenceCheck.H
deleted file mode 100644
index b56197f22..000000000
--- a/applications/solvers/coupled/conjugateHeatFoam/initConvergenceCheck.H
+++ /dev/null
@@ -1,7 +0,0 @@
-// initialize values for convergence checks
-
-    scalar eqnResidual = 1, maxResidual = 0;
-    scalar convergenceCriterion = 0;
-
-    simple.readIfPresent("convergence", convergenceCriterion);
-
diff --git a/applications/solvers/coupled/conjugateHeatFoam/pEqn.H b/applications/solvers/coupled/conjugateHeatFoam/pEqn.H
index 57e9a156d..e85345491 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/pEqn.H
+++ b/applications/solvers/coupled/conjugateHeatFoam/pEqn.H
@@ -10,7 +10,7 @@
     surfaceScalarField buoyancyPhi(rUAf*ghf*fvc::snGrad(rhok)*mesh.magSf());
     phi -= buoyancyPhi;
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (piso.correctNonOrthogonal())
     {
         fvScalarMatrix p_rghEqn
         (
@@ -19,16 +19,15 @@
 
         p_rghEqn.setReference(pRefCell, pRefValue);
 
-        if (corr == nCorr-1 && nonOrth == nNonOrthCorr)
-        {
-            p_rghEqn.solve(mesh.solutionDict().solver(p_rgh.name() + "Final"));
-        }
-        else
-        {
-            p_rghEqn.solve(mesh.solutionDict().solver(p_rgh.name()));
-        }
+        p_rghEqn.solve
+        (
+            mesh.solutionDict().solver
+            (
+                p_rgh.select(piso.finalInnerIter())
+            )
+        );
 
-        if (nonOrth == nNonOrthCorr)
+        if (piso.finalNonOrthogonalIter())
         {
             // Calculate the conservative fluxes
             phi -= p_rghEqn.flux();
diff --git a/applications/solvers/coupled/conjugateHeatFoam/readSolidControls.H b/applications/solvers/coupled/conjugateHeatFoam/readSolidControls.H
deleted file mode 100644
index c2b6f17f5..000000000
--- a/applications/solvers/coupled/conjugateHeatFoam/readSolidControls.H
+++ /dev/null
@@ -1,7 +0,0 @@
-    const dictionary& simple = solidMesh.solutionDict().subDict("SIMPLE");
-
-    int nNonOrthCorr = 0;
-    if (simple.found("nNonOrthogonalCorrectors"))
-    {
-        nNonOrthCorr = readInt(simple.lookup("nNonOrthogonalCorrectors"));
-    }
diff --git a/applications/solvers/coupled/conjugateHeatFoam/solveEnergy.H b/applications/solvers/coupled/conjugateHeatFoam/solveEnergy.H
index e7f3c809c..61b5863c2 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/solveEnergy.H
+++ b/applications/solvers/coupled/conjugateHeatFoam/solveEnergy.H
@@ -1,8 +1,8 @@
 {
     // Solid side
-#   include "readSolidControls.H"
+    simpleControl simpleSolid(solidMesh);
 
-    for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+    while (simpleSolid.correctNonOrthogonal())
     {
         coupledFvScalarMatrix TEqns(2);
 
diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/UEqn.H b/applications/solvers/coupled/conjugateHeatSimpleFoam/UEqn.H
index 59633497a..32510f030 100644
--- a/applications/solvers/coupled/conjugateHeatSimpleFoam/UEqn.H
+++ b/applications/solvers/coupled/conjugateHeatSimpleFoam/UEqn.H
@@ -9,7 +9,7 @@
 
     UEqn().relax();
 
-    eqnResidual = solve
+    solve
     (
         UEqn()
       ==
@@ -22,6 +22,4 @@
                 )*mesh.magSf()
             )
         )
-    ).initialResidual();
-
-    maxResidual = max(eqnResidual, maxResidual);
+    );
diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/conjugateHeatSimpleFoam.C b/applications/solvers/coupled/conjugateHeatSimpleFoam/conjugateHeatSimpleFoam.C
index 9a1e44be9..a34d1a3ed 100644
--- a/applications/solvers/coupled/conjugateHeatSimpleFoam/conjugateHeatSimpleFoam.C
+++ b/applications/solvers/coupled/conjugateHeatSimpleFoam/conjugateHeatSimpleFoam.C
@@ -38,6 +38,7 @@ Description
 #include "thermalModel.H"
 #include "singlePhaseTransportModel.H"
 #include "RASModel.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -47,6 +48,9 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createFluidMesh.H"
 #   include "createSolidMesh.H"
+
+    simpleControl simple(mesh);
+
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "createSolidFields.H"
@@ -56,13 +60,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readSIMPLEControls.H"
-#       include "initConvergenceCheck.H"
-
         // Detach patches
 #       include "detachPatches.H"
 
diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/createFields.H b/applications/solvers/coupled/conjugateHeatSimpleFoam/createFields.H
index e84f341f8..42330b79f 100644
--- a/applications/solvers/coupled/conjugateHeatSimpleFoam/createFields.H
+++ b/applications/solvers/coupled/conjugateHeatSimpleFoam/createFields.H
@@ -64,13 +64,8 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell
-    (
-        p_rgh,
-        mesh.solutionDict().subDict("SIMPLE"),
-        pRefCell,
-        pRefValue
-    );
+    setRefCell(p_rgh, simple.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p_rgh.name());
 
     autoPtr<incompressible::RASModel> turbulence
     (
diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/initConvergenceCheck.H b/applications/solvers/coupled/conjugateHeatSimpleFoam/initConvergenceCheck.H
deleted file mode 100644
index b56197f22..000000000
--- a/applications/solvers/coupled/conjugateHeatSimpleFoam/initConvergenceCheck.H
+++ /dev/null
@@ -1,7 +0,0 @@
-// initialize values for convergence checks
-
-    scalar eqnResidual = 1, maxResidual = 0;
-    scalar convergenceCriterion = 0;
-
-    simple.readIfPresent("convergence", convergenceCriterion);
-
diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/pEqn.H b/applications/solvers/coupled/conjugateHeatSimpleFoam/pEqn.H
index 559b052c6..dddf81e5b 100644
--- a/applications/solvers/coupled/conjugateHeatSimpleFoam/pEqn.H
+++ b/applications/solvers/coupled/conjugateHeatSimpleFoam/pEqn.H
@@ -11,7 +11,7 @@
     surfaceScalarField buoyancyPhi(rUAf*ghf*fvc::snGrad(rhok)*mesh.magSf());
     phi -= buoyancyPhi;
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (simple.correctNonOrthogonal())
     {
         fvScalarMatrix p_rghEqn
         (
@@ -20,18 +20,9 @@
 
         p_rghEqn.setReference(pRefCell, pRefValue);
 
-        // retain the residual from the first iteration
-        if (nonOrth == 0)
-        {
-            eqnResidual = p_rghEqn.solve().initialResidual();
-            maxResidual = max(eqnResidual, maxResidual);
-        }
-        else
-        {
-            p_rghEqn.solve();
-        }
+        p_rghEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (simple.finalNonOrthogonalIter())
         {
             // Calculate the conservative fluxes
             phi -= p_rghEqn.flux();
diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/readSolidControls.H b/applications/solvers/coupled/conjugateHeatSimpleFoam/readSolidControls.H
deleted file mode 100644
index c2b6f17f5..000000000
--- a/applications/solvers/coupled/conjugateHeatSimpleFoam/readSolidControls.H
+++ /dev/null
@@ -1,7 +0,0 @@
-    const dictionary& simple = solidMesh.solutionDict().subDict("SIMPLE");
-
-    int nNonOrthCorr = 0;
-    if (simple.found("nNonOrthogonalCorrectors"))
-    {
-        nNonOrthCorr = readInt(simple.lookup("nNonOrthogonalCorrectors"));
-    }
diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/solveEnergy.H b/applications/solvers/coupled/conjugateHeatSimpleFoam/solveEnergy.H
index 95d0a236a..833d954e8 100644
--- a/applications/solvers/coupled/conjugateHeatSimpleFoam/solveEnergy.H
+++ b/applications/solvers/coupled/conjugateHeatSimpleFoam/solveEnergy.H
@@ -1,8 +1,8 @@
 {
     // Solid side
-#   include "readSolidControls.H"
+    simpleControl simpleSolid(solidMesh);
 
-    for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+    while (simpleSolid.correctNonOrthogonal())
     {
         coupledFvScalarMatrix TEqns(2);
 
diff --git a/applications/solvers/coupled/pUCoupledFoam/createFields.H b/applications/solvers/coupled/pUCoupledFoam/createFields.H
index 2a2a4a833..179cbd40f 100644
--- a/applications/solvers/coupled/pUCoupledFoam/createFields.H
+++ b/applications/solvers/coupled/pUCoupledFoam/createFields.H
@@ -65,3 +65,5 @@ volScalarField rAU
     mesh,
     runTime.deltaT()
 );
+
+mesh.schemesDict().setFluxRequired(p.name());
\ No newline at end of file
diff --git a/applications/solvers/electromagnetics/mhdFoam/createFields.H b/applications/solvers/electromagnetics/mhdFoam/createFields.H
index b54cae44c..d5a0e62de 100644
--- a/applications/solvers/electromagnetics/mhdFoam/createFields.H
+++ b/applications/solvers/electromagnetics/mhdFoam/createFields.H
@@ -104,4 +104,7 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
+
+    mesh.schemesDict().setFluxRequired(pB.name());
diff --git a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
index 44394f123..06058ce45 100644
--- a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
+++ b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
@@ -50,6 +50,7 @@ Description
 
 #include "fvCFD.H"
 #include "OSspecific.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -59,6 +60,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 
@@ -69,7 +73,6 @@ int main(int argc, char *argv[])
 
     while (runTime.loop())
     {
-#       include "readPISOControls.H"
 #       include "readBPISOControls.H"
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
@@ -91,7 +94,7 @@ int main(int argc, char *argv[])
 
             // --- PISO loop
 
-            for (int corr = 0; corr < nCorr; corr++)
+            while (piso.correct())
             {
                 volScalarField rUA = 1.0/UEqn.A();
 
@@ -100,7 +103,7 @@ int main(int argc, char *argv[])
                 phi = (fvc::interpolate(U) & mesh.Sf())
                     + fvc::ddtPhiCorr(rUA, U, phi);
 
-                for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+                while (piso.correctNonOrthogonal())
                 {
                     fvScalarMatrix pEqn
                     (
@@ -110,7 +113,7 @@ int main(int argc, char *argv[])
                     pEqn.setReference(pRefCell, pRefValue);
                     pEqn.solve();
 
-                    if (nonOrth == nNonOrthCorr)
+                    if (piso.finalNonOrthogonalIter())
                     {
                         phi -= pEqn.flux();
                     }
diff --git a/applications/solvers/engine/icoDyMEngineFoam/createFields.H b/applications/solvers/engine/icoDyMEngineFoam/createFields.H
index 9e28b859b..3fbf47549 100644
--- a/applications/solvers/engine/icoDyMEngineFoam/createFields.H
+++ b/applications/solvers/engine/icoDyMEngineFoam/createFields.H
@@ -52,7 +52,7 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
 
     scalar totalVolume = sum(mesh.V()).value();
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H b/applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H
index 21a4d5fab..0c599154d 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H
@@ -6,13 +6,9 @@
       + turbulence->divDevRhoReff(U)
     );
 
-    if (oCorr == nOuterCorr - 1)
-    {
-        UEqn.relax(1);
-    }
-    else
-    {
-        UEqn.relax();
-    }
+    UEqn.relax
+    (
+        mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()))
+    );
 
     solve(UEqn == -fvc::grad(p));
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/createFields.H b/applications/solvers/engine/sonicTurbDyMEngineFoam/createFields.H
index 030e65640..6acbbcbb6 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/createFields.H
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/createFields.H
@@ -128,3 +128,5 @@
         ),
         fvc::interpolate(rho) * fvc::meshPhi(U)
     );
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/pEqn.H b/applications/solvers/engine/sonicTurbDyMEngineFoam/pEqn.H
index 05075d8d7..45d692a63 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/pEqn.H
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/pEqn.H
@@ -4,18 +4,13 @@
     rUA = 1.0/UEqn.A();
     U = rUA*UEqn.H();
 
-    if (nOuterCorr != 1)
-    {
-        p.storePrevIter();
-    }
-
-    if (transonic)
+    if (pimple.transonic())
     {
         surfaceScalarField phid =
             fvc::interpolate(thermo.psi())*
             ((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U));
 
-        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+        while (pimple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
@@ -26,7 +21,7 @@
 
             pEqn.solve();
 
-            if (nonOrth == nNonOrthCorr)
+            if (pimple.finalNonOrthogonalIter())
             {
                 phi == pEqn.flux();
             }
@@ -37,7 +32,7 @@
         phi = fvc::interpolate(rho)*
             ((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U));
 
-        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+        while (pimple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
@@ -48,7 +43,7 @@
 
             pEqn.solve();
 
-            if (nonOrth == nNonOrthCorr)
+            if (pimple.finalNonOrthogonalIter())
             {
                 phi += pEqn.flux();
             }
@@ -56,7 +51,7 @@
     }
 
     // Explicitly relax pressure except for last corrector
-    if (oCorr != nOuterCorr - 1)
+    if (!pimple.finalIter())
     {
         p.relax();
     }
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C b/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C
index 04225e83b..5b2b6e2f3 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C
@@ -39,6 +39,7 @@ Description
 #include "turbulenceModel.H"
 #include "Switch.H"
 #include "OFstream.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,7 +50,9 @@ int main(int argc, char *argv[])
 
 #   include "createEngineTime.H"
 #   include "createEngineDynamicMesh.H"
-#   include "readPIMPLEControls.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 #   include "createTimeControls.H"
@@ -67,7 +70,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-#       include "readPIMPLEControls.H"
 #       include "checkTotalVolume.H"
 #       include "readEngineTimeControls.H"
 #       include "compressibleCourantNo.H"
@@ -106,19 +108,18 @@ int main(int argc, char *argv[])
         }
 
         // Pressure-velocity corrector
-        int oCorr = 0;
-        do
+        while (pimple.loop())
         {
 #           include "rhoEqn.H"
 #           include "UEqn.H"
 
             // --- PISO loop
-            for (int corr = 1; corr <= nCorr; corr++)
+            while (pimple.correct())
             {
 #               include "pEqn.H"
 #               include "hEqn.H"
             }
-        } while (++oCorr < nOuterCorr);
+        }
 
         turbulence->correct();
 
diff --git a/applications/solvers/engine/turbDyMEngineFoam/UEqn.H b/applications/solvers/engine/turbDyMEngineFoam/UEqn.H
index d60edb253..eb6b24fce 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/UEqn.H
+++ b/applications/solvers/engine/turbDyMEngineFoam/UEqn.H
@@ -5,7 +5,7 @@
       + turbulence->divDevReff(U)
     );
 
-    if (momentumPredictor)
+    if (piso.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
     }
diff --git a/applications/solvers/engine/turbDyMEngineFoam/correctPhi.H b/applications/solvers/engine/turbDyMEngineFoam/correctPhi.H
index 5a8dc6a33..42cac00cf 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/correctPhi.H
+++ b/applications/solvers/engine/turbDyMEngineFoam/correctPhi.H
@@ -28,7 +28,7 @@
 
     mesh.schemesDict().setFluxRequired(pcorr.name());
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (piso.correctNonOrthogonal())
     {
         fvScalarMatrix pcorrEqn
         (
@@ -38,7 +38,7 @@
         pcorrEqn.setReference(pRefCell, pRefValue);
         pcorrEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (piso.finalNonOrthogonalIter())
         {
             phi -= pcorrEqn.flux();
         }
diff --git a/applications/solvers/engine/turbDyMEngineFoam/createControls.H b/applications/solvers/engine/turbDyMEngineFoam/createControls.H
index d76028fda..04d4121db 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/createControls.H
+++ b/applications/solvers/engine/turbDyMEngineFoam/createControls.H
@@ -1,8 +1,6 @@
 #   include "createTimeControls.H"
-#   include "readPISOControls.H"
 
-    bool checkMeshCourantNo = false;
-    if (piso.found("checkMeshCourantNo"))
-    {
-        checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
-    }
+bool checkMeshCourantNo
+(
+    piso.dict().lookupOrDefault("checkMeshCourantNo", false)
+);
diff --git a/applications/solvers/engine/turbDyMEngineFoam/createFields.H b/applications/solvers/engine/turbDyMEngineFoam/createFields.H
index 2db24767d..9cad74217 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/createFields.H
+++ b/applications/solvers/engine/turbDyMEngineFoam/createFields.H
@@ -33,7 +33,8 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
     scalar totalVolume = sum(mesh.V()).value();
 
diff --git a/applications/solvers/engine/turbDyMEngineFoam/readControls.H b/applications/solvers/engine/turbDyMEngineFoam/readControls.H
index 375b524f2..bf221077f 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/readControls.H
+++ b/applications/solvers/engine/turbDyMEngineFoam/readControls.H
@@ -1,8 +1,3 @@
 #   include "readTimeControls.H"
-#   include "readPISOControls.H"
 
-    checkMeshCourantNo = false;
-    if (piso.found("checkMeshCourantNo"))
-    {
-        checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
-    }
+checkMeshCourantNo = piso.dict().lookupOrDefault("checkMeshCourantNo", false);
diff --git a/applications/solvers/engine/turbDyMEngineFoam/turbDyMEngineFoam.C b/applications/solvers/engine/turbDyMEngineFoam/turbDyMEngineFoam.C
index 780a16a7f..1a8d46463 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/turbDyMEngineFoam.C
+++ b/applications/solvers/engine/turbDyMEngineFoam/turbDyMEngineFoam.C
@@ -35,6 +35,7 @@ Description
 #include "turbulenceModel.H"
 #include "dynamicFvMesh.H"
 #include "engineTime.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,6 +46,9 @@ int main(int argc, char *argv[])
 
 #   include "createEngineTime.H"
 #   include "createDynamicFvMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
 #   include "createControls.H"
@@ -89,7 +93,7 @@ int main(int argc, char *argv[])
 #       include "UEqn.H"
 
         // --- PISO loop
-        for (int corr = 0; corr < nCorr; corr++)
+        while (piso.correct())
         {
             rUA = 1.0/UEqn.A();
 
@@ -99,7 +103,7 @@ int main(int argc, char *argv[])
 
             adjustPhi(phi, U, p);
 
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            while (piso.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
@@ -108,16 +112,12 @@ int main(int argc, char *argv[])
 
                 pEqn.setReference(pRefCell, pRefValue);
 
-                if (corr == nCorr - 1 && nonOrth == nNonOrthCorr)
-                {
-                    pEqn.solve(mesh.solutionDict().solver(p.name() + "Final"));
-                }
-                else
-                {
-                    pEqn.solve(mesh.solutionDict().solver(p.name()));
-                }
+                pEqn.solve
+                (
+                    mesh.solutionDict().solver(p.select(piso.finalInnerIter()))
+                );
 
-                if (nonOrth == nNonOrthCorr)
+                if (piso.finalNonOrthogonalIter())
                 {
                     phi -= pEqn.flux();
                 }
diff --git a/applications/solvers/equationReaderDemo/UEqn.H b/applications/solvers/equationReaderDemo/UEqn.H
index eb40b7665..e6fb6bf89 100644
--- a/applications/solvers/equationReaderDemo/UEqn.H
+++ b/applications/solvers/equationReaderDemo/UEqn.H
@@ -8,9 +8,4 @@
 
     UEqn().relax();
 
-    eqnResidual = solve
-    (
-        UEqn() == -fvc::grad(p)
-    ).initialResidual();
-
-    maxResidual = max(eqnResidual, maxResidual);
+    solve(UEqn() == -fvc::grad(p));
diff --git a/applications/solvers/equationReaderDemo/createFields.H b/applications/solvers/equationReaderDemo/createFields.H
index ab4249625..239a6938f 100644
--- a/applications/solvers/equationReaderDemo/createFields.H
+++ b/applications/solvers/equationReaderDemo/createFields.H
@@ -31,7 +31,8 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
 
     singlePhaseTransportModel laminarTransport(U, phi);
diff --git a/applications/solvers/equationReaderDemo/equationReaderDemo.C b/applications/solvers/equationReaderDemo/equationReaderDemo.C
index 78cb4890b..d7efd06ab 100644
--- a/applications/solvers/equationReaderDemo/equationReaderDemo.C
+++ b/applications/solvers/equationReaderDemo/equationReaderDemo.C
@@ -36,6 +36,7 @@ Author
 #include "singlePhaseTransportModel.H"
 #include "RASModel.H"
 #include "IOEquationReader.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,6 +45,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    simpleControl simple(mesh);
+
 #   include "createFields.H"
 #   include "createEquationReader.H"
 #   include "loadEquationData.H"
@@ -54,22 +58,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-    dictionary simple = mesh.solutionDict().subDict("SIMPLE");
-
-    int nNonOrthCorr =
-        simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
-
-    bool momentumPredictor =
-        simple.lookupOrDefault<Switch>("momentumPredictor", true);
-
-#       include "initConvergenceCheck.H"
-
-        p.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
 #           include "UEqn.H"
@@ -85,8 +77,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-#       include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;
diff --git a/applications/solvers/equationReaderDemo/pEqn.H b/applications/solvers/equationReaderDemo/pEqn.H
index 42ebfc225..22921f652 100644
--- a/applications/solvers/equationReaderDemo/pEqn.H
+++ b/applications/solvers/equationReaderDemo/pEqn.H
@@ -7,7 +7,7 @@
     adjustPhi(phi, U, p);
 
     // Non-orthogonal pressure corrector loop
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (simple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -16,18 +16,9 @@
 
         pEqn.setReference(pRefCell, pRefValue);
 
-        // Retain the residual from the first iteration
-        if (nonOrth == 0)
-        {
-            eqnResidual = pEqn.solve().initialResidual();
-            maxResidual = max(eqnResidual, maxResidual);
-        }
-        else
-        {
-            pEqn.solve();
-        }
+        pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (simple.finalNonOrthogonalIter())
         {
             phi -= pEqn.flux();
         }
diff --git a/applications/solvers/heatTransfer/boussinesqBuoyantFoam/boussinesqBuoyantFoam.C b/applications/solvers/heatTransfer/boussinesqBuoyantFoam/boussinesqBuoyantFoam.C
index fbb31ef8d..a2daaf199 100644
--- a/applications/solvers/heatTransfer/boussinesqBuoyantFoam/boussinesqBuoyantFoam.C
+++ b/applications/solvers/heatTransfer/boussinesqBuoyantFoam/boussinesqBuoyantFoam.C
@@ -31,6 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -41,6 +42,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "readTransportProperties.H"
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
@@ -50,11 +54,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    for (runTime++; !runTime.end(); runTime++)
+    while (runTime.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPISOControls.H"
 #       include "CourantNo.H"
 
         fvVectorMatrix UEqn
@@ -70,7 +73,7 @@ int main(int argc, char *argv[])
 
         // --- PISO loop
 
-        for (int corr = 0; corr < nCorr; corr++)
+        while (piso.correct())
         {
             volScalarField rUA = 1.0/UEqn.A();
 
@@ -80,7 +83,7 @@ int main(int argc, char *argv[])
 
             adjustPhi(phi, U, p);
 
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            while (piso.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
@@ -90,7 +93,7 @@ int main(int argc, char *argv[])
                 pEqn.setReference(pRefCell, pRefValue);
                 pEqn.solve();
 
-                if (nonOrth == nNonOrthCorr)
+                if (piso.finalNonOrthogonalIter())
                 {
                     phi -= pEqn.flux();
                 }
diff --git a/applications/solvers/heatTransfer/boussinesqBuoyantFoam/createFields.H b/applications/solvers/heatTransfer/boussinesqBuoyantFoam/createFields.H
index ce61861ee..247634b45 100644
--- a/applications/solvers/heatTransfer/boussinesqBuoyantFoam/createFields.H
+++ b/applications/solvers/heatTransfer/boussinesqBuoyantFoam/createFields.H
@@ -48,7 +48,8 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
     Info<< "Reading/calculating field rho\n" << endl;
     volScalarField rho
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/UEqn.H
index 35387f4ff..fa68de296 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/UEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/UEqn.H
@@ -9,7 +9,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (piso.momentumPredictor())
     {
         solve
         (
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
index 73547b6a3..e91ead7cd 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
@@ -48,6 +48,7 @@ Description
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulenceModel.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -56,6 +57,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
@@ -72,7 +76,6 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readTimeControls.H"
-#       include "readPISOControls.H"
 #       include "CourantNo.H"
 #       include "setDeltaT.H"
 
@@ -80,7 +83,7 @@ int main(int argc, char *argv[])
 #       include "TEqn.H"
 
         // --- PISO loop
-        for (int corr = 0; corr < nCorr; corr++)
+        while (piso.correct())
         {
 #           include "pEqn.H"
         }
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/createFields.H
index b2fa0af92..8aaa0132c 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/createFields.H
@@ -54,13 +54,8 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell
-    (
-        p,
-        mesh.solutionDict().subDict("PISO"),
-        pRefCell,
-        pRefValue
-    );
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
 
     // Kinematic density for buoyancy force
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/pEqn.H
index 02d86340c..2601d0eb6 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/pEqn.H
@@ -12,23 +12,16 @@
 
     phi = phiU + rUAf*fvc::interpolate(rhok)*(g & mesh.Sf());
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (piso.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
             fvm::laplacian(rUAf, p) == fvc::div(phi)
         );
 
-        if (corr == nCorr - 1 && nonOrth == nNonOrthCorr)
-        {
-            pEqn.solve(mesh.solutionDict().solver(p.name() + "Final"));
-        }
-        else
-        {
-            pEqn.solve(mesh.solutionDict().solver(p.name()));
-        }
+        pEqn.solve(mesh.solutionDict().solver(p.select(piso.finalInnerIter())));
 
-        if (nonOrth == nNonOrthCorr)
+        if (piso.finalNonOrthogonalIter())
         {
             phi -= pEqn.flux();
         }
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H
index 7452a0495..3bdeea045 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H
@@ -14,8 +14,7 @@
 
     TEqn.relax();
 
-    eqnResidual = TEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
+    TEqn.solve();
 
     rhok = 1.0 - beta*(T - TRef);
 }
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H
index bcf99e166..292f44b4b 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H
@@ -8,7 +8,7 @@
 
     UEqn().relax();
 
-    eqnResidual = solve
+    solve
     (
         UEqn()
       ==
@@ -19,6 +19,4 @@
               - fvc::snGrad(p)*mesh.magSf()
             )
         )
-    ).initialResidual();
-
-    maxResidual = max(eqnResidual, maxResidual);
+    );
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
index acfd8ff48..341f0a3a4 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -48,6 +48,7 @@ Description
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "RASModel.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -56,6 +57,9 @@ 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 "initContinuityErrs.H"
@@ -64,15 +68,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        #include "readSIMPLEControls.H"
-        #include "initConvergenceCheck.H"
-
-        p.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
             #include "UEqn.H"
@@ -87,8 +86,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-        #include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/convergenceCheck.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/convergenceCheck.H
deleted file mode 100644
index 895806319..000000000
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/convergenceCheck.H
+++ /dev/null
@@ -1,9 +0,0 @@
-// check convergence
-
-if (maxResidual < convergenceCriterion)
-{
-    Info<< "reached convergence criterion: " << convergenceCriterion << endl;
-    runTime.writeAndEnd();
-    Info<< "latestTime = " << runTime.timeName() << endl;
-}
-
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H
index 0e668e9d9..6b90f53a6 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H
@@ -57,14 +57,8 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell
-    (
-        p,
-        mesh.solutionDict().subDict("SIMPLE"),
-        pRefCell,
-        pRefValue
-    );
-
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
     // Kinematic density for buoyancy force
     volScalarField rhok
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/initConvergenceCheck.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/initConvergenceCheck.H
deleted file mode 100644
index b56197f22..000000000
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/initConvergenceCheck.H
+++ /dev/null
@@ -1,7 +0,0 @@
-// initialize values for convergence checks
-
-    scalar eqnResidual = 1, maxResidual = 0;
-    scalar convergenceCriterion = 0;
-
-    simple.readIfPresent("convergence", convergenceCriterion);
-
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
index 6408c7ccc..256a336f3 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
@@ -12,7 +12,7 @@
         rUAf*fvc::interpolate(rhok)*(g & mesh.Sf());
     phi += buoyancyPhi;
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (simple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -21,18 +21,9 @@
 
         pEqn.setReference(pRefCell, pRefValue);
 
-        // retain the residual from the first iteration
-        if (nonOrth == 0)
-        {
-            eqnResidual = pEqn.solve().initialResidual();
-            maxResidual = max(eqnResidual, maxResidual);
-        }
-        else
-        {
-            pEqn.solve();
-        }
+        pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (simple.finalNonOrthogonalIter())
         {
             // Calculate the conservative fluxes
             phi -= pEqn.flux();
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantPisoFoam/UEqn.H
index d4878d063..230f18661 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/UEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/UEqn.H
@@ -9,7 +9,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (piso.momentumPredictor())
     {
         solve
         (
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
index 2a277a9bf..05dd6a70f 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
@@ -37,6 +37,7 @@ Description
 #include "basicRhoThermo.H"
 #include "turbulenceModel.H"
 #include "fixedGradientFvPatchFields.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,6 +46,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
@@ -59,7 +63,6 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
 #       include "readTimeControls.H"
-#       include "readPISOControls.H"
 #       include "compressibleCourantNo.H"
 #       include "setDeltaT.H"
 
@@ -75,7 +78,7 @@ int main(int argc, char *argv[])
 
         // --- PISO loop
 
-        for (int corr = 0; corr < nCorr; corr++)
+        while (piso.correct())
         {
 #           include "pEqn.H"
         }
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPisoFoam/createFields.H
index b8ac5595e..616d1c170 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/createFields.H
@@ -65,3 +65,5 @@
     dimensionedScalar initialMass = fvc::domainIntegrate(rho);
 
     dimensionedScalar totalVolume = sum(mesh.V());
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPisoFoam/pEqn.H
index f78fb9483..64edba028 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/pEqn.H
@@ -23,7 +23,7 @@
 
     phi = phiU + rhorUAf*fvc::interpolate(rho)*(g & mesh.Sf());
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (piso.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -32,16 +32,9 @@
           - fvm::laplacian(rhorUAf, p)
         );
 
-        if (corr == nCorr - 1 && nonOrth == nNonOrthCorr)
-        {
-            pEqn.solve(mesh.solutionDict().solver(p.name() + "Final"));
-        }
-        else
-        {
-            pEqn.solve(mesh.solutionDict().solver(p.name()));
-        }
+        pEqn.solve(mesh.solutionDict().solver(p.select(piso.finalInnerIter())));
 
-        if (nonOrth == nNonOrthCorr)
+        if (piso.finalNonOrthogonalIter())
         {
             phi += pEqn.flux();
         }
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H
index 0170d6e38..560988360 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H
@@ -8,7 +8,7 @@
 
     UEqn().relax();
 
-    eqnResidual = solve
+    solve
     (
         UEqn()
      ==
@@ -17,6 +17,4 @@
             fvc::interpolate(rho)*(g & mesh.Sf())
           - fvc::snGrad(p)*mesh.magSf()
         )
-    ).initialResidual();
-
-    maxResidual = max(eqnResidual, maxResidual);
+    );
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index 913f3634b..9ff38ec08 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -33,6 +33,7 @@ Description
 #include "basicPsiThermo.H"
 #include "RASModel.H"
 #include "fixedGradientFvPatchFields.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -41,6 +42,9 @@ 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 "initContinuityErrs.H"
@@ -49,16 +53,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        #include "readSIMPLEControls.H"
-        #include "initConvergenceCheck.H"
-
-        p.storePrevIter();
-        rho.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
             #include "UEqn.H"
@@ -73,8 +71,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-        #include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/convergenceCheck.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/convergenceCheck.H
deleted file mode 100644
index 895806319..000000000
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/convergenceCheck.H
+++ /dev/null
@@ -1,9 +0,0 @@
-// check convergence
-
-if (maxResidual < convergenceCriterion)
-{
-    Info<< "reached convergence criterion: " << convergenceCriterion << endl;
-    runTime.writeAndEnd();
-    Info<< "latestTime = " << runTime.timeName() << endl;
-}
-
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
index b304ace10..3539a0eee 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
@@ -57,13 +57,9 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell
-    (
-        p,
-        mesh.solutionDict().subDict("SIMPLE"),
-        pRefCell,
-        pRefValue
-    );
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
 
 
     dimensionedScalar initialMass = fvc::domainIntegrate(rho);
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H
index 0c507ce3d..b91a17ee7 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H
@@ -11,8 +11,7 @@
 
     hEqn.relax();
 
-    eqnResidual = hEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
+    hEqn.solve();
 
     thermo.correct();
 }
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/initConvergenceCheck.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/initConvergenceCheck.H
deleted file mode 100644
index c920b6708..000000000
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/initConvergenceCheck.H
+++ /dev/null
@@ -1,7 +0,0 @@
-    // initialize values for convergence checks
-
-    scalar eqnResidual = 1, maxResidual = 0;
-    scalar convergenceCriterion = 0;
-
-    simple.readIfPresent("convergence", convergenceCriterion);
-
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
index 11768ea2f..0321e0748 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
@@ -14,7 +14,7 @@
         rhorUAf*fvc::interpolate(rho)*(g & mesh.Sf());
     phi += buoyancyPhi;
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (simple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -23,18 +23,9 @@
 
         pEqn.setReference(pRefCell, pRefValue);
 
-        // retain the residual from the first iteration
-        if (nonOrth == 0)
-        {
-            eqnResidual = pEqn.solve().initialResidual();
-            maxResidual = max(eqnResidual, maxResidual);
-        }
-        else
-        {
-            pEqn.solve();
-        }
+        pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (simple.finalNonOrthogonalIter())
         {
             // For closed-volume cases adjust the pressure and density levels
             // to obey overall mass continuity
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
index f5ee87a62..3f451f99c 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
@@ -35,6 +35,7 @@ Description
 #include "RASModel.H"
 #include "fixedGradientFvPatchFields.H"
 #include "radiationModel.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,6 +44,9 @@ 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 "createRadiationModel.H"
@@ -52,16 +56,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readSIMPLEControls.H"
-#       include "initConvergenceCheck.H"
-
-        p.storePrevIter();
-        rho.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
 #           include "UEqn.H"
@@ -76,8 +74,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-#       include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H
index 24b17645d..57de44e4a 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H
@@ -12,8 +12,7 @@
 
     hEqn.relax();
 
-    eqnResidual = hEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
+    hEqn.solve();
 
     thermo.correct();
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
index 49bffaa4d..5e584cce7 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
@@ -15,3 +15,5 @@
     volScalarField& h = thermo.h();
 
     const dimensionedScalar massIni("massIni", dimMass, initialMassFluid[i]);
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
index 656fb42e5..4c1b4d921 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
@@ -22,3 +22,5 @@
 
     const label pRefCell = pRefCellFluid[i];
     const scalar pRefValue = pRefValueFluid[i];
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/immersedBoundary/icoDyMIbFoam/createFields.H b/applications/solvers/immersedBoundary/icoDyMIbFoam/createFields.H
index 51c10db46..2721134d9 100644
--- a/applications/solvers/immersedBoundary/icoDyMIbFoam/createFields.H
+++ b/applications/solvers/immersedBoundary/icoDyMIbFoam/createFields.H
@@ -52,5 +52,5 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PIMPLE"), pRefCell, pRefValue);
-    mesh.schemesDict().setFluxRequired(p.name());
\ No newline at end of file
+    setRefCell(p, pimple.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/immersedBoundary/icoIbFoam/createFields.H b/applications/solvers/immersedBoundary/icoIbFoam/createFields.H
index 51c10db46..2721134d9 100644
--- a/applications/solvers/immersedBoundary/icoIbFoam/createFields.H
+++ b/applications/solvers/immersedBoundary/icoIbFoam/createFields.H
@@ -52,5 +52,5 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PIMPLE"), pRefCell, pRefValue);
-    mesh.schemesDict().setFluxRequired(p.name());
\ No newline at end of file
+    setRefCell(p, pimple.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/immersedBoundary/interIbFoam/createFields.H b/applications/solvers/immersedBoundary/interIbFoam/createFields.H
index 0fcdf751b..68e3b368f 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/createFields.H
+++ b/applications/solvers/immersedBoundary/interIbFoam/createFields.H
@@ -103,22 +103,13 @@
 
     label pdRefCell = 0;
     scalar pdRefValue = 0.0;
-    setRefCell
-    (
-        pd,
-        mesh.solutionDict().subDict("PIMPLE"),
-        pdRefCell,
-        pdRefValue
-    );
+    setRefCell(pd, pimple.dict(), pdRefCell, pdRefValue);
 
     scalar pRefValue = 0.0;
 
     if (pd.needReference())
     {
-        pRefValue = readScalar
-        (
-            mesh.solutionDict().subDict("PIMPLE").lookup("pRefValue")
-        );
+        pRefValue = readScalar(pimple.dict().lookup("pRefValue"));
 
         p += dimensionedScalar
         (
diff --git a/applications/solvers/immersedBoundary/interIbFoam/limitU.H b/applications/solvers/immersedBoundary/interIbFoam/limitU.H
index 0c59414f8..c014ae74f 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/limitU.H
+++ b/applications/solvers/immersedBoundary/interIbFoam/limitU.H
@@ -1,6 +1,5 @@
 {
-    scalar limitMagU =
-        readScalar(mesh.solutionDict().subDict("PIMPLE").lookup("limitMagU"));
+    scalar limitMagU = readScalar(pimple.dict().lookup("limitMagU"));
 
     volScalarField magU(mag(U));
 
diff --git a/applications/solvers/immersedBoundary/interIbFoam/pEqn.H b/applications/solvers/immersedBoundary/interIbFoam/pEqn.H
index a765455fc..56980d7da 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/pEqn.H
+++ b/applications/solvers/immersedBoundary/interIbFoam/pEqn.H
@@ -1,9 +1,4 @@
 {
-    if (!pimple.firstIter())
-    {
-        pd.storePrevIter();
-    }
-
     volScalarField rUA = 1.0/UEqn.A();
     surfaceScalarField rUAf = fvc::interpolate(rUA);
 
diff --git a/applications/solvers/immersedBoundary/porousSimpleIbFoam/createFields.H b/applications/solvers/immersedBoundary/porousSimpleIbFoam/createFields.H
index 6dc7d36c8..a6ba38265 100644
--- a/applications/solvers/immersedBoundary/porousSimpleIbFoam/createFields.H
+++ b/applications/solvers/immersedBoundary/porousSimpleIbFoam/createFields.H
@@ -31,7 +31,7 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
 
     singlePhaseTransportModel laminarTransport(U, phi);
diff --git a/applications/solvers/immersedBoundary/porousSimpleIbFoam/porousSimpleIbFoam.C b/applications/solvers/immersedBoundary/porousSimpleIbFoam/porousSimpleIbFoam.C
index 6c873025b..d2e97067b 100644
--- a/applications/solvers/immersedBoundary/porousSimpleIbFoam/porousSimpleIbFoam.C
+++ b/applications/solvers/immersedBoundary/porousSimpleIbFoam/porousSimpleIbFoam.C
@@ -60,12 +60,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        p.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
 #           include "UEqn.H"
diff --git a/applications/solvers/immersedBoundary/potentialIbFoam/createFields.H b/applications/solvers/immersedBoundary/potentialIbFoam/createFields.H
index d45cac025..09ed08451 100644
--- a/applications/solvers/immersedBoundary/potentialIbFoam/createFields.H
+++ b/applications/solvers/immersedBoundary/potentialIbFoam/createFields.H
@@ -46,5 +46,5 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/immersedBoundary/simpleIbFoam/createFields.H b/applications/solvers/immersedBoundary/simpleIbFoam/createFields.H
index 7527c084a..1819fb887 100644
--- a/applications/solvers/immersedBoundary/simpleIbFoam/createFields.H
+++ b/applications/solvers/immersedBoundary/simpleIbFoam/createFields.H
@@ -31,7 +31,7 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
 
     singlePhaseTransportModel laminarTransport(U, phi);
diff --git a/applications/solvers/immersedBoundary/simpleIbFoam/simpleIbFoam.C b/applications/solvers/immersedBoundary/simpleIbFoam/simpleIbFoam.C
index 69c09be88..9b6decb00 100644
--- a/applications/solvers/immersedBoundary/simpleIbFoam/simpleIbFoam.C
+++ b/applications/solvers/immersedBoundary/simpleIbFoam/simpleIbFoam.C
@@ -59,12 +59,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        p.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
 #           include "UEqn.H"
diff --git a/applications/solvers/incompressible/MRFSimpleFoam/MRFSimpleFoam.C b/applications/solvers/incompressible/MRFSimpleFoam/MRFSimpleFoam.C
index 8790ddbb1..e5f10c97c 100644
--- a/applications/solvers/incompressible/MRFSimpleFoam/MRFSimpleFoam.C
+++ b/applications/solvers/incompressible/MRFSimpleFoam/MRFSimpleFoam.C
@@ -55,12 +55,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    for (runTime++; !runTime.end(); runTime++)
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        p.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
             // Momentum predictor
diff --git a/applications/solvers/incompressible/MRFSimpleFoam/createFields.H b/applications/solvers/incompressible/MRFSimpleFoam/createFields.H
index 3a08cae15..8ae490c37 100644
--- a/applications/solvers/incompressible/MRFSimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/MRFSimpleFoam/createFields.H
@@ -31,7 +31,7 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
 
     singlePhaseTransportModel laminarTransport(U, phi);
diff --git a/applications/solvers/incompressible/channelFoam/createFields.H b/applications/solvers/incompressible/channelFoam/createFields.H
index 20af043b8..5bf5173f3 100644
--- a/applications/solvers/incompressible/channelFoam/createFields.H
+++ b/applications/solvers/incompressible/channelFoam/createFields.H
@@ -32,7 +32,7 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
 
     singlePhaseTransportModel laminarTransport(U, phi);
diff --git a/applications/solvers/incompressible/icoDyMFoam/createFields.H b/applications/solvers/incompressible/icoDyMFoam/createFields.H
index 4b37f06a1..509a91657 100644
--- a/applications/solvers/incompressible/icoDyMFoam/createFields.H
+++ b/applications/solvers/incompressible/icoDyMFoam/createFields.H
@@ -52,7 +52,7 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
 
 
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H b/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H
index 4b37f06a1..509a91657 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H
@@ -52,7 +52,7 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
 
 
diff --git a/applications/solvers/incompressible/icoFoam/createFields.H b/applications/solvers/incompressible/icoFoam/createFields.H
index 4fc0be97a..4fdfcb208 100644
--- a/applications/solvers/incompressible/icoFoam/createFields.H
+++ b/applications/solvers/incompressible/icoFoam/createFields.H
@@ -52,5 +52,5 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/createFields.H b/applications/solvers/incompressible/nonNewtonianIcoFoam/createFields.H
index 2eb6e0ed4..b80225fd8 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/createFields.H
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/createFields.H
@@ -36,5 +36,5 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/UEqn.H b/applications/solvers/incompressible/pimpleDyMFoam/UEqn.H
index 1fd514634..5f4a38c9f 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/UEqn.H
+++ b/applications/solvers/incompressible/pimpleDyMFoam/UEqn.H
@@ -10,7 +10,7 @@
 
     // Get under-relaxation factor
     scalar UUrf =
-        mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter()));
+        mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()));
 
     if (pimple.momentumPredictor())
     {
@@ -23,4 +23,4 @@
           - fvc::grad(p),
             mesh.solutionDict().solver((U.select(pimple.finalIter())))
         );
-    }
\ No newline at end of file
+    }
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/createFields.H b/applications/solvers/incompressible/pimpleDyMFoam/createFields.H
index 3362e9353..74a461355 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/createFields.H
+++ b/applications/solvers/incompressible/pimpleDyMFoam/createFields.H
@@ -32,7 +32,7 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PIMPLE"), pRefCell, pRefValue);
+    setRefCell(p, pimple.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
 
     singlePhaseTransportModel laminarTransport(U, phi);
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
index b1cd87930..b5c0638df 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
@@ -103,11 +103,6 @@ int main(int argc, char *argv[])
         // --- PIMPLE loop
         while (pimple.loop())
         {
-            if (!pimple.firstIter())
-            {
-                p.storePrevIter();
-            }
-
 #           include "UEqn.H"
 
             // --- PISO loop
diff --git a/applications/solvers/incompressible/pimpleFoam/UEqn.H b/applications/solvers/incompressible/pimpleFoam/UEqn.H
index ae7f8ce4d..df018319c 100644
--- a/applications/solvers/incompressible/pimpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/UEqn.H
@@ -10,7 +10,7 @@ fvVectorMatrix ddtUEqn(fvm::ddt(U));
 
 // Get under-relaxation factor
 scalar UUrf =
-    mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter()));
+    mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()));
 
 if (pimple.momentumPredictor())
 {
diff --git a/applications/solvers/incompressible/pimpleFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/createFields.H
index a5e399ff9..a60a24493 100644
--- a/applications/solvers/incompressible/pimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/pimpleFoam/createFields.H
@@ -31,7 +31,7 @@ volVectorField U
 
 label pRefCell = 0;
 scalar pRefValue = 0.0;
-setRefCell(p, mesh.solutionDict().subDict("PIMPLE"), pRefCell, pRefValue);
+setRefCell(p, pimple.dict(), pRefCell, pRefValue);
 mesh.schemesDict().setFluxRequired(p.name());
 
 singlePhaseTransportModel laminarTransport(U, phi);
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index cc61b85bb..0cd1eef37 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -71,11 +71,6 @@ int main(int argc, char *argv[])
         // --- PIMPLE loop
         while (pimple.loop())
         {
-            if (!pimple.firstIter())
-            {
-                p.storePrevIter();
-            }
-
 #           include "UEqn.H"
 
             // --- PISO loop
diff --git a/applications/solvers/incompressible/pisoFoam/createFields.H b/applications/solvers/incompressible/pisoFoam/createFields.H
index 4342b3c25..b2e291e36 100644
--- a/applications/solvers/incompressible/pisoFoam/createFields.H
+++ b/applications/solvers/incompressible/pisoFoam/createFields.H
@@ -31,7 +31,7 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
 
 
diff --git a/applications/solvers/incompressible/porousSimpleFoam/createFields.H b/applications/solvers/incompressible/porousSimpleFoam/createFields.H
index fa4f98151..2213074f6 100644
--- a/applications/solvers/incompressible/porousSimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/porousSimpleFoam/createFields.H
@@ -31,7 +31,7 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
 
     singlePhaseTransportModel laminarTransport(U, phi);
@@ -49,12 +49,9 @@
     if (pZones.size())
     {
         // nUCorrectors for pressureImplicitPorosity
-        if (mesh.solutionDict().subDict("SIMPLE").found("nUCorrectors"))
+        if (simple.dict().found("nUCorrectors"))
         {
-            nUCorr = readInt
-            (
-                mesh.solutionDict().subDict("SIMPLE").lookup("nUCorrectors")
-            );
+            nUCorr = readInt(simple.dict().lookup("nUCorrectors"));
         }
 
         if (nUCorr > 0)
diff --git a/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C
index c54de64ff..83bd923c9 100644
--- a/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C
+++ b/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C
@@ -53,12 +53,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        p.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
             #include "UEqn.H"
diff --git a/applications/solvers/incompressible/simpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/UEqn.H
index 6bb9b59bd..76c83cdf0 100644
--- a/applications/solvers/incompressible/simpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/UEqn.H
@@ -7,7 +7,7 @@
     );
 
     // Get under-relaxation factor
-    const scalar UUrf = mesh.solutionDict().relaxationFactor(U.name());
+    const scalar UUrf = mesh.solutionDict().equationRelaxationFactor(U.name());
 
     // Momentum solution
     solve
diff --git a/applications/solvers/incompressible/simpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/createFields.H
index c55d47984..78d6fd69d 100644
--- a/applications/solvers/incompressible/simpleFoam/createFields.H
+++ b/applications/solvers/incompressible/simpleFoam/createFields.H
@@ -31,7 +31,7 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
 
     singlePhaseTransportModel laminarTransport(U, phi);
diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
index f80402526..8bd72c217 100644
--- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
@@ -55,12 +55,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.loop())
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        p.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
 #           include "UEqn.H"
diff --git a/applications/solvers/incompressible/simpleSRFFoam/UEqn.H b/applications/solvers/incompressible/simpleSRFFoam/UEqn.H
index 070e768d8..fd8521e0c 100644
--- a/applications/solvers/incompressible/simpleSRFFoam/UEqn.H
+++ b/applications/solvers/incompressible/simpleSRFFoam/UEqn.H
@@ -8,7 +8,7 @@
     );
 
     // Get under-relaxation factor
-    const scalar UUrf = mesh.solutionDict().relaxationFactor(Urel.name());
+    const scalar UUrf = mesh.solutionDict().equationRelaxationFactor(Urel.name());
 
     // Momentum solution
     solve(relax(HUrelEqn(), UUrf) == -fvc::grad(p));
diff --git a/applications/solvers/incompressible/simpleSRFFoam/createFields.H b/applications/solvers/incompressible/simpleSRFFoam/createFields.H
index 9cabfc5d0..11f446869 100644
--- a/applications/solvers/incompressible/simpleSRFFoam/createFields.H
+++ b/applications/solvers/incompressible/simpleSRFFoam/createFields.H
@@ -42,7 +42,7 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
     mesh.schemesDict().setFluxRequired(p.name());
 
     singlePhaseTransportModel laminarTransport(Urel, phi);
diff --git a/applications/solvers/incompressible/simpleSRFFoam/simpleSRFFoam.C b/applications/solvers/incompressible/simpleSRFFoam/simpleSRFFoam.C
index de7c37556..c997a4c03 100644
--- a/applications/solvers/incompressible/simpleSRFFoam/simpleSRFFoam.C
+++ b/applications/solvers/incompressible/simpleSRFFoam/simpleSRFFoam.C
@@ -59,12 +59,10 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    for (runTime++; !runTime.end(); runTime++)
+    while(simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        p.storePrevIter();
-
         // Pressure-velocity SIMPLE corrector
         {
             // Momentum predictor
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
index b02a7c61e..deb710cce 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
@@ -11,7 +11,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
     }
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index 4d031e521..570327101 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@@ -44,6 +44,7 @@ Description
 #include "chemistrySolver.H"
 #include "timeActivatedExplicitSource.H"
 #include "radiationModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,6 +54,9 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
     #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
     #include "readChemistryProperties.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
@@ -70,7 +74,6 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
         #include "readTimeControls.H"
-        #include "readPISOControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
 
@@ -89,14 +92,14 @@ int main(int argc, char *argv[])
         #include "rhoEqn.H"
 
         // --- PIMPLE loop
-        for (int ocorr=1; ocorr<=nOuterCorr; ocorr++)
+        while (pimple.loop())
         {
             #include "UEqn.H"
             #include "YEqn.H"
             #include "hsEqn.H"
 
             // --- PISO loop
-            for (int corr=1; corr<=nCorr; corr++)
+            while (pimple.correct())
             {
                 #include "pEqn.H"
             }
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
index 65be09775..12a6e9548 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
@@ -149,3 +149,5 @@
         mesh,
         dimensionedScalar("chemistrySh", dimEnergy/dimTime/dimVolume, 0.0)
     );
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
index b31ad45ed..9878707eb 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
@@ -3,7 +3,7 @@ rho = thermo.rho();
 volScalarField rUA = 1.0/UEqn.A();
 U = rUA*UEqn.H();
 
-if (transonic)
+if (pimple.transonic())
 {
     surfaceScalarField phid
     (
@@ -15,7 +15,7 @@ if (transonic)
         )
     );
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -28,7 +28,7 @@ if (transonic)
 
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi == pEqn.flux();
         }
@@ -43,7 +43,7 @@ else
           + fvc::ddtPhiCorr(rUA, rho, U, phi)
         );
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -56,7 +56,7 @@ else
 
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi += pEqn.flux();
         }
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H
index e77fe75da..f46d1d902 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H
@@ -12,7 +12,7 @@
 
     pZones.addResistance(UEqn);
 
-    if (momentumPredictor)
+    if (piso.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
     }
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H
index cf3f484bd..7a5b48ac9 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H
@@ -103,3 +103,5 @@
         mesh,
         dimensionedScalar("chemistrySh", dimEnergy/dimTime/dimVolume, 0.0)
     );
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
index 43d677609..ff590e59e 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
@@ -23,7 +23,7 @@
             );
     }
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (piso.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -35,16 +35,9 @@
           + massSource.SuTot()
         );
 
-        if (corr == nCorr-1 && nonOrth == nNonOrthCorr)
-        {
-            pEqn.solve(mesh.solutionDict().solver("pFinal"));
-        }
-        else
-        {
-            pEqn.solve();
-        }
+        pEqn.solve(mesh.solutionDict().solver(p.select(piso.finalInnerIter())));
 
-        if (nonOrth == nNonOrthCorr)
+        if (piso.finalNonOrthogonalIter())
         {
             phi += pEqn.flux();
         }
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
index de63f2fbb..68ef32448 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
@@ -49,6 +49,7 @@ Description
 #include "radiationModel.H"
 #include "porousZones.H"
 #include "timeActivatedExplicitSource.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -58,6 +59,9 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
     #include "createMesh.H"
+
+    pisoControl piso(mesh);
+
     #include "readChemistryProperties.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
@@ -77,7 +81,6 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
         #include "readTimeControls.H"
-        #include "readPISOControls.H"
         #include "readAdditionalSolutionControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
@@ -95,7 +98,7 @@ int main(int argc, char *argv[])
         #include "hsEqn.H"
 
         // --- PISO loop
-        for (int corr = 0; corr < nCorr; corr++)
+        while (piso.correct())
         {
             #include "pEqn.H"
         }
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H
index 3c4a92709..1c1c1fd0c 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H
@@ -10,7 +10,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
     }
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
index e071ac8b3..9579be78c 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
@@ -109,3 +109,5 @@
         mesh,
         dimensionedScalar("chemistry::Sh", dimEnergy/dimTime/dimVolume, 0.0)
     );
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
index d27afcce8..50185f5fc 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
@@ -3,7 +3,7 @@ rho = thermo.rho();
 volScalarField rUA = 1.0/UEqn.A();
 U = rUA*UEqn.H();
 
-if (transonic)
+if (pimple.transonic())
 {
     surfaceScalarField phid
     (
@@ -15,7 +15,7 @@ if (transonic)
         )
     );
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -28,7 +28,7 @@ if (transonic)
 
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi == pEqn.flux();
         }
@@ -43,7 +43,7 @@ else
           + fvc::ddtPhiCorr(rUA, rho, U, phi)
         );
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -56,7 +56,7 @@ else
 
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi += pEqn.flux();
         }
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
index 154774cca..93971a15b 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -37,6 +37,7 @@ Description
 #include "psiChemistryModel.H"
 #include "chemistrySolver.H"
 #include "radiationModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,6 +47,9 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
     #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
     #include "readChemistryProperties.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
@@ -63,7 +67,6 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
         #include "readTimeControls.H"
-        #include "readPISOControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
 
@@ -77,13 +80,13 @@ int main(int argc, char *argv[])
         #include "rhoEqn.H"
 
         // --- PIMPLE loop
-        for (int ocorr=1; ocorr<=nOuterCorr; ocorr++)
+        while (pimple.loop())
         {
             #include "UEqn.H"
             #include "YEqn.H"
 
             // --- PISO loop
-            for (int corr=1; corr<=nCorr; corr++)
+            while (pimple.correct())
             {
                 #include "hsEqn.H"
                 #include "pEqn.H"
diff --git a/applications/solvers/multiSolver/multiSolverDemo/createFields_icoFoam.H b/applications/solvers/multiSolver/multiSolverDemo/createFields_icoFoam.H
index 6a7d6b9a8..2e2c782db 100644
--- a/applications/solvers/multiSolver/multiSolverDemo/createFields_icoFoam.H
+++ b/applications/solvers/multiSolver/multiSolverDemo/createFields_icoFoam.H
@@ -52,4 +52,5 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/multiSolver/multiSolverDemo/multiSolverDemo.C b/applications/solvers/multiSolver/multiSolverDemo/multiSolverDemo.C
index 27091f810..084de4811 100644
--- a/applications/solvers/multiSolver/multiSolverDemo/multiSolverDemo.C
+++ b/applications/solvers/multiSolver/multiSolverDemo/multiSolverDemo.C
@@ -35,6 +35,8 @@ Author
 
 #include "fvCFD.H"
 #include "multiSolver.H"
+#include "pisoControl.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/multiSolver/multiSolverDemo/solverIcoFoam.H b/applications/solvers/multiSolver/multiSolverDemo/solverIcoFoam.H
index 1fedb60d0..2a2407e3c 100644
--- a/applications/solvers/multiSolver/multiSolverDemo/solverIcoFoam.H
+++ b/applications/solvers/multiSolver/multiSolverDemo/solverIcoFoam.H
@@ -1,6 +1,9 @@
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "createFields_icoFoam.H"
 #   include "initContinuityErrs.H"
 
@@ -12,7 +15,6 @@
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPISOControls.H"
 #       include "CourantNo.H"
 
         fvVectorMatrix UEqn
@@ -26,7 +28,7 @@
 
         // --- PISO loop
 
-        for (int corr=0; corr<nCorr; corr++)
+        while (piso.correct())
         {
             volScalarField rUA = 1.0/UEqn.A();
 
@@ -36,7 +38,7 @@
 
             adjustPhi(phi, U, p);
 
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            while (piso.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
@@ -46,7 +48,7 @@
                 pEqn.setReference(pRefCell, pRefValue);
                 pEqn.solve();
 
-                if (nonOrth == nNonOrthCorr)
+                if (piso.finalNonOrthogonalIter())
                 {
                     phi -= pEqn.flux();
                 }
diff --git a/applications/solvers/multiSolver/multiSolverDemo/solverScalarTransportFoam.H b/applications/solvers/multiSolver/multiSolverDemo/solverScalarTransportFoam.H
index 024effd64..c39ef8447 100644
--- a/applications/solvers/multiSolver/multiSolverDemo/solverScalarTransportFoam.H
+++ b/applications/solvers/multiSolver/multiSolverDemo/solverScalarTransportFoam.H
@@ -1,5 +1,8 @@
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    simpleControl simple(mesh);
+
 #   include "createFields_scalarTransportFoam.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -8,19 +11,11 @@
 
 #   include "CourantNo.H"
 
-    for (runTime++; !runTime.end(); runTime++)
+    while (simple.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-    dictionary simple = mesh.solutionDict().subDict("SIMPLE");
-
-    int nNonOrthCorr =
-        simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
-
-    bool momentumPredictor =
-        simple.lookupOrDefault<Switch>("momentumPredictor", true);
-
-        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+        while (simple.correctNonOrthogonal())
         {
             solve
             (
diff --git a/applications/solvers/multiphase/MRFInterFoam/MRFInterFoam.C b/applications/solvers/multiphase/MRFInterFoam/MRFInterFoam.C
index d4374d687..d2dec21ac 100644
--- a/applications/solvers/multiphase/MRFInterFoam/MRFInterFoam.C
+++ b/applications/solvers/multiphase/MRFInterFoam/MRFInterFoam.C
@@ -43,6 +43,7 @@ Description
 #include "twoPhaseMixture.H"
 #include "turbulenceModel.H"
 #include "MRFZones.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,8 +52,10 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
     #include "readGravitationalAcceleration.H"
-    #include "readPIMPLEControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "createMRFZones.H"
@@ -67,7 +70,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readPIMPLEControls.H"
         #include "readTimeControls.H"
         #include "CourantNo.H"
         #include "setDeltaT.H"
@@ -77,8 +79,7 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         // Pressure-velocity corrector
-        int oCorr = 0;
-        do
+        while (pimple.loop())
         {
             twoPhaseProperties.correct();
 
@@ -87,7 +88,7 @@ int main(int argc, char *argv[])
 #           include "UEqn.H"
 
             // --- PISO loop
-            for (int corr=0; corr<nCorr; corr++)
+            while (pimple.correct())
             {
 #               include "pEqn.H"
             }
@@ -95,7 +96,7 @@ int main(int argc, char *argv[])
 #           include "continuityErrs.H"
 
             turbulence->correct();
-        } while (++oCorr < nOuterCorr);
+        }
 
         runTime.write();
 
diff --git a/applications/solvers/multiphase/MRFInterFoam/UEqn.H b/applications/solvers/multiphase/MRFInterFoam/UEqn.H
index 0a65664f7..cc0763d8b 100644
--- a/applications/solvers/multiphase/MRFInterFoam/UEqn.H
+++ b/applications/solvers/multiphase/MRFInterFoam/UEqn.H
@@ -17,7 +17,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve
         (
diff --git a/applications/solvers/multiphase/MRFInterFoam/pEqn.H b/applications/solvers/multiphase/MRFInterFoam/pEqn.H
index b52c7441c..49d6dc579 100644
--- a/applications/solvers/multiphase/MRFInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/MRFInterFoam/pEqn.H
@@ -20,7 +20,7 @@
         )*rUAf;
     adjustPhi(phi, U, p);
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pdEqn
         (
@@ -29,16 +29,12 @@
 
         pdEqn.setReference(pdRefCell, pdRefValue);
 
-        if (corr == nCorr-1 && nonOrth == nNonOrthCorr)
-        {
-            pdEqn.solve(mesh.solutionDict().solver(pd.name() + "Final"));
-        }
-        else
-        {
-            pdEqn.solve(mesh.solutionDict().solver(pd.name()));
-        }
+        pdEqn.solve
+        (
+            mesh.solutionDict().solver(pd.select(pimple.finalInnerIter()))
+        );
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi -= pdEqn.flux();
         }
diff --git a/applications/solvers/multiphase/barotropicCavitatingFoam/barotropicCavitatingFoam.C b/applications/solvers/multiphase/barotropicCavitatingFoam/barotropicCavitatingFoam.C
index 4d04b5c36..ac37acbbe 100644
--- a/applications/solvers/multiphase/barotropicCavitatingFoam/barotropicCavitatingFoam.C
+++ b/applications/solvers/multiphase/barotropicCavitatingFoam/barotropicCavitatingFoam.C
@@ -30,6 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -40,7 +41,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
-#   include "readPISOControls.H"
+
+    pisoControl piso(mesh);
+
 #   include "readThermodynamicProperties.H"
 #   include "readTransportProperties.H"
 #   include "createFields.H"
@@ -61,7 +64,7 @@ int main(int argc, char *argv[])
 #       include "UEqn.H"
 
         // --- PISO loop
-        for (int corr = 0; corr < nCorr; corr++)
+        while (piso.correct())
         {
 #           include "pEqn.H"
         }
diff --git a/applications/solvers/multiphase/barotropicCavitatingFoam/createFields.H b/applications/solvers/multiphase/barotropicCavitatingFoam/createFields.H
index 1286f1d6f..835fa2cfa 100644
--- a/applications/solvers/multiphase/barotropicCavitatingFoam/createFields.H
+++ b/applications/solvers/multiphase/barotropicCavitatingFoam/createFields.H
@@ -75,3 +75,5 @@
         ),
         (gamma*psig + (1.0 - gamma)*psil)/rho
     );
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/multiphase/barotropicCavitatingFoam/pEqn.H b/applications/solvers/multiphase/barotropicCavitatingFoam/pEqn.H
index 84f5f0910..cc5e701d2 100644
--- a/applications/solvers/multiphase/barotropicCavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/barotropicCavitatingFoam/pEqn.H
@@ -15,7 +15,7 @@
 
     surfaceScalarField phip = fvc::interpolate(psiByRho)*phi;
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (piso.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -29,7 +29,7 @@
            + fvc::div(phi) - pEqn
         );
 
-        if (nonOrth == nNonOrthCorr)
+        if (piso.finalNonOrthogonalIter())
         {
             phi -= pEqn.flux();
         }
diff --git a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
index e77fd4a81..1104be238 100644
--- a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
+++ b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
@@ -34,6 +34,7 @@ Description
 #include "nearWallDist.H"
 #include "wallFvPatch.H"
 #include "Switch.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,6 +44,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
@@ -64,7 +68,7 @@ int main(int argc, char *argv[])
 
         // --- PISO loop
 
-        for (int corr = 0; corr < nCorr; corr++)
+        while (piso.correct())
         {
 #           include "pEqn.H"
 
diff --git a/applications/solvers/multiphase/bubbleFoam/createFields.H b/applications/solvers/multiphase/bubbleFoam/createFields.H
index 875a4f1be..26013f9f4 100644
--- a/applications/solvers/multiphase/bubbleFoam/createFields.H
+++ b/applications/solvers/multiphase/bubbleFoam/createFields.H
@@ -178,4 +178,5 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/multiphase/bubbleFoam/pEqn.H b/applications/solvers/multiphase/bubbleFoam/pEqn.H
index dde9a0857..98a3ca381 100644
--- a/applications/solvers/multiphase/bubbleFoam/pEqn.H
+++ b/applications/solvers/multiphase/bubbleFoam/pEqn.H
@@ -38,7 +38,7 @@
         alphaf*rUaAf/rhoa + betaf*rUbAf/rhob
     );
 
-    for(int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+    while (piso.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -48,7 +48,7 @@
         pEqn.setReference(pRefCell, pRefValue);
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (piso.finalNonOrthogonalIter())
         {
             surfaceScalarField SfGradp = pEqn.flux()/Dp;
 
diff --git a/applications/solvers/multiphase/bubbleFoam/readBubbleFoamControls.H b/applications/solvers/multiphase/bubbleFoam/readBubbleFoamControls.H
index bf70e2bab..05bf3c6eb 100644
--- a/applications/solvers/multiphase/bubbleFoam/readBubbleFoamControls.H
+++ b/applications/solvers/multiphase/bubbleFoam/readBubbleFoamControls.H
@@ -1,5 +1,3 @@
-#   include "readPISOControls.H"
+    int nAlphaCorr(readInt(piso.dict().lookup("nAlphaCorr")));
 
-    int nAlphaCorr(readInt(piso.lookup("nAlphaCorr")));
-
-    Switch correctAlpha(piso.lookup("correctAlpha"));
+    Switch correctAlpha(piso.dict().lookup("correctAlpha"));
diff --git a/applications/solvers/multiphase/cavitatingFoam/UEqn.H b/applications/solvers/multiphase/cavitatingFoam/UEqn.H
index 01911faaa..9a5761b59 100644
--- a/applications/solvers/multiphase/cavitatingFoam/UEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/UEqn.H
@@ -16,7 +16,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
     }
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index ff40c6ade..d2d293a78 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -36,6 +36,7 @@ Description
 #include "barotropicCompressibilityModel.H"
 #include "twoPhaseMixture.H"
 #include "turbulenceModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,10 +46,12 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "readThermodynamicProperties.H"
 #   include "createControls.H"
 #   include "createFields.H"
-#   include "initContinuityErrs.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"
 
@@ -65,13 +68,13 @@ int main(int argc, char *argv[])
         runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        for (int outerCorr = 0; outerCorr < nOuterCorr; outerCorr++)
+        while (pimple.loop())
         {
 #           include "rhoEqn.H"
 #           include "gammaPsi.H"
 #           include "UEqn.H"
 
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
 #               include "pEqn.H"
             }
diff --git a/applications/solvers/multiphase/cavitatingFoam/createFields.H b/applications/solvers/multiphase/cavitatingFoam/createFields.H
index 49c7de147..26835d1f5 100644
--- a/applications/solvers/multiphase/cavitatingFoam/createFields.H
+++ b/applications/solvers/multiphase/cavitatingFoam/createFields.H
@@ -83,3 +83,6 @@
     (
         incompressible::turbulenceModel::New(U, phiv, twoPhaseProperties)
     );
+
+    mesh.schemesDict().setFluxRequired(p.name());
+    mesh.schemesDict().setFluxRequired(rho.name());
diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
index 9d7956629..17061666a 100644
--- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -1,5 +1,5 @@
 {
-    if (nOuterCorr == 1)
+    if (pimple.firstIter())
     {
         p =
         (
@@ -24,7 +24,7 @@
 
 #   include "resetPhivPatches.H"
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -35,16 +35,12 @@
           - fvm::laplacian(rUAf, p)
         );
 
-        if (corr == nCorr - 1 && nonOrth == nNonOrthCorr)
-        {
-            pEqn.solve(mesh.solutionDict().solver(p.name() + "Final"));
-        }
-        else
-        {
-            pEqn.solve(mesh.solutionDict().solver(p.name()));
-        }
+        pEqn.solve
+        (
+            mesh.solutionDict().solver(p.select(pimple.finalInnerIter()))
+        );
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phiv += (phiGradp + pEqn.flux())/rhof;
         }
@@ -80,9 +76,9 @@
     U = HbyA - rUA*fvc::grad(p);
 
     // Remove the swirl component of velocity for "wedge" cases
-    if (piso.found("removeSwirl"))
+    if (pimple.dict().found("removeSwirl"))
     {
-        label swirlCmpt(readLabel(piso.lookup("removeSwirl")));
+        label swirlCmpt(readLabel(pimple.dict().lookup("removeSwirl")));
 
         Info<< "Removing swirl component-" << swirlCmpt << " of U" << endl;
         U.field().replace(swirlCmpt, 0.0);
diff --git a/applications/solvers/multiphase/cavitatingFoam/readControls.H b/applications/solvers/multiphase/cavitatingFoam/readControls.H
index d4206bef4..a2d4dc80a 100644
--- a/applications/solvers/multiphase/cavitatingFoam/readControls.H
+++ b/applications/solvers/multiphase/cavitatingFoam/readControls.H
@@ -1,5 +1,3 @@
 #include "readTimeControls.H"
 
 maxAcousticCo = readScalar(runTime.controlDict().lookup("maxAcousticCo"));
-
-#include "readPISOControls.H"
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H b/applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H
index 2becae7f2..b02f00cd7 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/UEqn.H
@@ -16,7 +16,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve
         (
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H
index 32a716313..5371c5b85 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H
@@ -1,12 +1,12 @@
 {
     label nAlphaCorr
     (
-        readLabel(piso.lookup("nAlphaCorr"))
+        readLabel(pimple.dict().lookup("nAlphaCorr"))
     );
 
     label nAlphaSubCycles
     (
-        readLabel(piso.lookup("nAlphaSubCycles"))
+        readLabel(pimple.dict().lookup("nAlphaSubCycles"))
     );
 
     surfaceScalarField phic = mag(phi/mesh.magSf());
@@ -38,7 +38,7 @@
 #       include "alphaEqns.H"
     }
 
-    if (oCorr == 0)
+    if (pimple.firstIter())
     {
         interface.correct();
     }
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 515d3c89f..e4464c475 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -43,6 +43,7 @@ Description
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
 #include "turbulenceModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,6 +52,9 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
+
+    pimpleControl pimple(mesh);
+
     #include "readGravitationalAcceleration.H"
     #include "createControls.H"
     #include "initContinuityErrs.H"
@@ -101,7 +105,7 @@ int main(int argc, char *argv[])
         turbulence->correct();
 
         // --- Outer-corrector loop
-        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
+        while (pimple.loop())
         {
             #include "alphaEqnsSubCycle.H"
 
@@ -110,7 +114,7 @@ int main(int argc, char *argv[])
             #include "UEqn.H"
 
             // --- PISO loop
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
                 #include "pEqn.H"
             }
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H
index 5a114050d..75d643165 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H
@@ -44,7 +44,7 @@
 
     mesh.schemesDict().setFluxRequired(pcorr.name());
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pcorrEqn
         (
@@ -53,7 +53,7 @@
 
         pcorrEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi -= pcorrEqn.flux();
         }
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/createControls.H b/applications/solvers/multiphase/compressibleInterDyMFoam/createControls.H
index d237eefb7..1c71f3c3a 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/createControls.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/createControls.H
@@ -1,27 +1,24 @@
-   #include "readPISOControls.H"
-   #include "createTimeControls.H"
+#include "createTimeControls.H"
 
-    label nAlphaSubCycles
-    (
-        readLabel(piso.lookup("nAlphaSubCycles"))
-    );
+label nAlphaSubCycles
+(
+    readLabel(pimple.dict().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);
-    }
+if (nAlphaSubCycles > 1 && pimple.nCorrPIMPLE() != 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 correctPhi
+(
+    pimple.dict().lookupOrDefault("correctPhi", true)
+);
 
-    bool checkMeshCourantNo = false;
-    if (piso.found("checkMeshCourantNo"))
-    {
-        checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
-    }
+bool checkMeshCourantNo
+(
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
+);
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H b/applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H
index 3da1b5e9c..a2f5fd0a8 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H
@@ -142,3 +142,5 @@
             pcorrTypes[i] = fixedValueFvPatchScalarField::typeName;
         }
     }
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H
index 56e1e6baa..df30525d3 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H
@@ -4,7 +4,7 @@
 
     tmp<fvScalarMatrix> pEqnComp;
 
-    if (transonic)
+    if (pimple.transonic())
     {
         pEqnComp =
             (fvm::ddt(p) + fvm::div(phi, p) - fvm::Sp(fvc::div(phi), p));
@@ -31,7 +31,7 @@
           + fvc::interpolate(rho)*(g & mesh.Sf())
         )*rUAf;
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqnIncomp
         (
@@ -39,12 +39,7 @@
           - fvm::laplacian(rUAf, p)
         );
 
-        if
-        (
-            oCorr == nOuterCorr-1
-            && corr == nCorr-1
-            && nonOrth == nNonOrthCorr
-        )
+        if (pimple.finalInnerIter())
         {
             solve
             (
@@ -70,7 +65,7 @@
             );
         }
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             dgdt =
                 (pos(alpha2)*(psi2/rho2) - pos(alpha1)*(psi1/rho1))
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H b/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
index bd209aef2..703827d6d 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
@@ -1,24 +1,15 @@
-   #include "readPISOControls.H"
-   #include "readTimeControls.H"
+#include "readTimeControls.H"
 
-    nAlphaSubCycles = readLabel(piso.lookup("nAlphaSubCycles"));
+nAlphaSubCycles = readLabel(pimple.dict().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);
-    }
+if (nAlphaSubCycles > 1 && pimple.nCorrPIMPLE() != 1)
+{
+    FatalErrorIn(args.executable())
+        << "Sub-cycling alpha is only allowed for PISO, "
+           "i.e. when the number of outer-correctors = 1"
+        << exit(FatalError);
+}
 
-    correctPhi = true;
-    if (piso.found("correctPhi"))
-    {
-        correctPhi = Switch(piso.lookup("correctPhi"));
-    }
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", true);
 
-    checkMeshCourantNo = false;
-    if (piso.found("checkMeshCourantNo"))
-    {
-        checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
-    }
+checkMeshCourantNo = pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/UEqn.H b/applications/solvers/multiphase/compressibleInterFoam/UEqn.H
index 0b1a9ac02..7ec0ef309 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/UEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/UEqn.H
@@ -16,7 +16,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve
         (
diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
index 89ba7a4e7..d57b8cd6e 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
@@ -1,12 +1,12 @@
 {
     label nAlphaCorr
     (
-        readLabel(piso.lookup("nAlphaCorr"))
+        readLabel(pimple.dict().lookup("nAlphaCorr"))
     );
 
     label nAlphaSubCycles
     (
-        readLabel(piso.lookup("nAlphaSubCycles"))
+        readLabel(pimple.dict().lookup("nAlphaSubCycles"))
     );
 
     surfaceScalarField phic = mag(phi/mesh.magSf());
@@ -36,7 +36,7 @@
         #include "alphaEqns.H"
     }
 
-    if (oCorr == 0)
+    if (pimple.firstIter())
     {
         interface.correct();
     }
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index 2469bda8c..1fb006e6c 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -41,6 +41,7 @@ Description
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
 #include "turbulenceModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,9 +50,11 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
     #include "readGravitationalAcceleration.H"
     #include "createControls.H"
-    #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
@@ -71,7 +74,7 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         // --- Outer-corrector loop
-        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
+        while (pimple.loop())
         {
             #include "alphaEqnsSubCycle.H"
 
@@ -80,7 +83,7 @@ int main(int argc, char *argv[])
             #include "UEqn.H"
 
             // --- PISO loop
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
                 #include "pEqn.H"
             }
diff --git a/applications/solvers/multiphase/compressibleInterFoam/createControls.H b/applications/solvers/multiphase/compressibleInterFoam/createControls.H
index f66279fee..819925018 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/createControls.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/createControls.H
@@ -1,15 +1,14 @@
-   #include "readPISOControls.H"
-   #include "createTimeControls.H"
+#include "createTimeControls.H"
 
-    label nAlphaSubCycles
-    (
-        readLabel(piso.lookup("nAlphaSubCycles"))
-    );
+label nAlphaSubCycles
+(
+    readLabel(pimple.dict().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);
-    }
+if (nAlphaSubCycles > 1 && pimple.nCorrPIMPLE() != 1)
+{
+    FatalErrorIn(args.executable())
+        << "Sub-cycling alpha is only allowed for PISO, "
+           "i.e. when the number of outer-correctors = 1"
+        << exit(FatalError);
+}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/createFields.H b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
index 3e6904d38..555d86782 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
@@ -127,3 +127,5 @@
     (
         incompressible::turbulenceModel::New(U, phi, twoPhaseProperties)
     );
+
+    mesh.schemesDict().setFluxRequired(p.name());
\ No newline at end of file
diff --git a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
index 9d2dc2391..f80200538 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
@@ -4,7 +4,7 @@
 
     tmp<fvScalarMatrix> pEqnComp;
 
-    if (transonic)
+    if (pimple.transonic())
     {
         pEqnComp =
             (fvm::ddt(p) + fvm::div(phi, p) - fvm::Sp(fvc::div(phi), p));
@@ -30,7 +30,7 @@
           + fvc::interpolate(rho)*(g & mesh.Sf())
         )*rUAf;
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqnIncomp
         (
@@ -48,7 +48,7 @@
           + pEqnIncomp
         );
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             dgdt =
                 (pos(alpha2)*(psi2/rho2) - pos(alpha1)*(psi1/rho1))
diff --git a/applications/solvers/multiphase/compressibleInterFoam/readControls.H b/applications/solvers/multiphase/compressibleInterFoam/readControls.H
index 10af30422..f5a1e5675 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/readControls.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/readControls.H
@@ -1,12 +1,11 @@
-   #include "readPISOControls.H"
-   #include "readTimeControls.H"
+#include "readTimeControls.H"
 
-    nAlphaSubCycles = readLabel(piso.lookup("nAlphaSubCycles"));
+nAlphaSubCycles = readLabel(pimple.dict().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);
-    }
+if (nAlphaSubCycles > 1 && pimple.nCorrPIMPLE() != 1)
+{
+    FatalErrorIn(args.executable())
+        << "Sub-cycling alpha is only allowed for PISO, "
+           "i.e. when the number of outer-correctors = 1"
+        << exit(FatalError);
+}
diff --git a/applications/solvers/multiphase/interDyMFoam/correctPhi.H b/applications/solvers/multiphase/interDyMFoam/correctPhi.H
index 78a616422..3fb0cadf7 100644
--- a/applications/solvers/multiphase/interDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interDyMFoam/correctPhi.H
@@ -29,7 +29,7 @@
 
     mesh.schemesDict().setFluxRequired(pcorr.name());
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pcorrEqn
         (
@@ -39,7 +39,7 @@
         pcorrEqn.setReference(pdRefCell, pdRefValue);
         pcorrEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi -= pcorrEqn.flux();
         }
diff --git a/applications/solvers/multiphase/interDyMFoam/createControls.H b/applications/solvers/multiphase/interDyMFoam/createControls.H
index b52e0509a..4c888d9e3 100644
--- a/applications/solvers/multiphase/interDyMFoam/createControls.H
+++ b/applications/solvers/multiphase/interDyMFoam/createControls.H
@@ -1,13 +1,11 @@
-#   include "createTimeControls.H"
+#include "createTimeControls.H"
 
-    bool correctPhi = true;
-    if (pimple.found("correctPhi"))
-    {
-        correctPhi = Switch(pimple.lookup("correctPhi"));
-    }
+bool correctPhi
+(
+    pimple.dict().lookupOrDefault("correctPhi", true)
+);
 
-    bool checkMeshCourantNo = false;
-    if (pimple.found("checkMeshCourantNo"))
-    {
-        checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo"));
-    }
+bool checkMeshCourantNo
+(
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
+);
diff --git a/applications/solvers/multiphase/interDyMFoam/createFields.H b/applications/solvers/multiphase/interDyMFoam/createFields.H
index 9ecfc062e..9b66f9ea7 100644
--- a/applications/solvers/multiphase/interDyMFoam/createFields.H
+++ b/applications/solvers/multiphase/interDyMFoam/createFields.H
@@ -123,22 +123,14 @@
 
     label pdRefCell = 0;
     scalar pdRefValue = 0.0;
-    setRefCell
-    (
-        pd,
-        mesh.solutionDict().subDict("PIMPLE"),
-        pdRefCell,
-        pdRefValue
-    );
+    setRefCell(pd, pimple.dict(), pdRefCell, pdRefValue);
+    mesh.schemesDict().setFluxRequired(pd.name());
 
     scalar pRefValue = 0.0;
 
     if (pd.needReference())
     {
-        pRefValue = readScalar
-        (
-            mesh.solutionDict().subDict("PIMPLE").lookup("pRefValue")
-        );
+        pRefValue = readScalar(pimple.dict().lookup("pRefValue"));
 
         p += dimensionedScalar
         (
diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
index 6315063a9..9bf398609 100644
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
@@ -39,6 +39,7 @@ Description
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
 #include "turbulenceModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -47,8 +48,10 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createDynamicFvMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "readGravitationalAcceleration.H"
-#   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
 #   include "createControls.H"
@@ -96,8 +99,7 @@ int main(int argc, char *argv[])
         }
 
         // Pressure-velocity corrector
-        int oCorr = 0;
-        do
+        while (pimple.loop())
         {
             twoPhaseProperties.correct();
 
@@ -106,7 +108,7 @@ int main(int argc, char *argv[])
 #           include "UEqn.H"
 
             // --- PISO loop
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
                     #           include "pEqn.H"
             }
@@ -124,7 +126,7 @@ int main(int argc, char *argv[])
             }
 
             turbulence->correct();
-        } while (++oCorr < nOuterCorr);
+        }
 
         runTime.write();
 
diff --git a/applications/solvers/multiphase/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interDyMFoam/pEqn.H
index 9654dcdb5..e2dea922e 100644
--- a/applications/solvers/multiphase/interDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interDyMFoam/pEqn.H
@@ -17,7 +17,7 @@
     )*rAUf*mesh.magSf();
 
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pdEqn
         (
@@ -26,16 +26,12 @@
 
         pdEqn.setReference(pdRefCell, pdRefValue);
 
-        if (corr == nCorr - 1 && nonOrth == nNonOrthCorr)
-        {
-            pdEqn.solve(mesh.solutionDict().solver(pd.name() + "Final"));
-        }
-        else
-        {
-            pdEqn.solve(mesh.solutionDict().solver(pd.name()));
-        }
+        pdEqn.solve
+        (
+            mesh.solutionDict().solver(pd.select(pimple.finalInnerIter()))
+        );
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi -= pdEqn.flux();
         }
diff --git a/applications/solvers/multiphase/interDyMFoam/readControls.H b/applications/solvers/multiphase/interDyMFoam/readControls.H
index b3b4512c3..f79b9c91b 100644
--- a/applications/solvers/multiphase/interDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/interDyMFoam/readControls.H
@@ -1,14 +1,5 @@
-#   include "readTimeControls.H"
-#   include "readPIMPLEControls.H"
+#include "readTimeControls.H"
 
-    correctPhi = true;
-    if (pimple.found("correctPhi"))
-    {
-        correctPhi = Switch(pimple.lookup("correctPhi"));
-    }
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", true);
 
-    checkMeshCourantNo = false;
-    if (pimple.found("checkMeshCourantNo"))
-    {
-        checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo"));
-    }
+checkMeshCourantNo = pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
diff --git a/applications/solvers/multiphase/interFoam/UEqn.H b/applications/solvers/multiphase/interFoam/UEqn.H
index 85972af16..5acb7a6ec 100644
--- a/applications/solvers/multiphase/interFoam/UEqn.H
+++ b/applications/solvers/multiphase/interFoam/UEqn.H
@@ -16,7 +16,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve
         (
diff --git a/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
index fcd2848a4..30e11b4b8 100644
--- a/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
@@ -1,11 +1,11 @@
 label nAlphaCorr
 (
-    readLabel(pimple.lookup("nAlphaCorr"))
+    readLabel(pimple.dict().lookup("nAlphaCorr"))
 );
 
 label nAlphaSubCycles
 (
-    readLabel(pimple.lookup("nAlphaSubCycles"))
+    readLabel(pimple.dict().lookup("nAlphaSubCycles"))
 );
 
 if (nAlphaSubCycles > 1)
diff --git a/applications/solvers/multiphase/interFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/correctPhi.H
index a1cb1bf0a..ec9c54ab4 100644
--- a/applications/solvers/multiphase/interFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/correctPhi.H
@@ -36,7 +36,7 @@
 
     mesh.schemesDict().setFluxRequired(pcorr.name());
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pcorrEqn
         (
@@ -46,7 +46,7 @@
         pcorrEqn.setReference(pdRefCell, pdRefValue);
         pcorrEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi -= pcorrEqn.flux();
         }
diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H
index 8012f798c..db7217a14 100644
--- a/applications/solvers/multiphase/interFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/createFields.H
@@ -103,22 +103,14 @@
 
     label pdRefCell = 0;
     scalar pdRefValue = 0.0;
-    setRefCell
-    (
-        pd,
-        mesh.solutionDict().subDict("PIMPLE"),
-        pdRefCell,
-        pdRefValue
-    );
+    setRefCell(pd, pimple.dict(), pdRefCell, pdRefValue);
+    mesh.schemesDict().setFluxRequired(pd.name());
 
     scalar pRefValue = 0.0;
 
     if (pd.needReference())
     {
-        pRefValue = readScalar
-        (
-            mesh.solutionDict().subDict("PIMPLE").lookup("pRefValue")
-        );
+        pRefValue = readScalar(pimple.dict().lookup("pRefValue"));
 
         p += dimensionedScalar
         (
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index c5bdc49ea..b0b136c23 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -43,6 +43,7 @@ Description
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
 #include "turbulenceModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,8 +52,10 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "readGravitationalAcceleration.H"
-#   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
 #   include "createTimeControls.H"
@@ -66,7 +69,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-#       include "readPIMPLEControls.H"
 #       include "readTimeControls.H"
 #       include "CourantNo.H"
 #       include "setDeltaT.H"
@@ -76,8 +78,7 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         // Pressure-velocity corrector
-        int oCorr = 0;
-        do
+        while (pimple.loop())
         {
             twoPhaseProperties.correct();
 
@@ -86,7 +87,7 @@ int main(int argc, char *argv[])
 #           include "UEqn.H"
 
             // --- PISO loop
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
 #               include "pEqn.H"
             }
@@ -106,7 +107,7 @@ int main(int argc, char *argv[])
             }
 
             turbulence->correct();
-        } while (++oCorr < nOuterCorr);
+        }
 
         runTime.write();
 
diff --git a/applications/solvers/multiphase/interFoam/pEqn.H b/applications/solvers/multiphase/interFoam/pEqn.H
index d2389bc16..ed5f16207 100644
--- a/applications/solvers/multiphase/interFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/pEqn.H
@@ -20,7 +20,7 @@
         )*rUAf*mesh.magSf();
 
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pdEqn
         (
@@ -29,16 +29,12 @@
 
         pdEqn.setReference(pdRefCell, pdRefValue);
 
-        if (corr == nCorr - 1 && nonOrth == nNonOrthCorr)
-        {
-            pdEqn.solve(mesh.solutionDict().solver(pd.name() + "Final"));
-        }
-        else
-        {
-            pdEqn.solve(mesh.solutionDict().solver(pd.name()));
-        }
+        pdEqn.solve
+        (
+            mesh.solutionDict().solver(pd.select(pimple.finalInnerIter()))
+        );
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi -= pdEqn.flux();
         }
diff --git a/applications/solvers/multiphase/interMixingFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/interMixingFoam/alphaEqnsSubCycle.H
index 765087a18..dfcd5299c 100644
--- a/applications/solvers/multiphase/interMixingFoam/alphaEqnsSubCycle.H
+++ b/applications/solvers/multiphase/interMixingFoam/alphaEqnsSubCycle.H
@@ -1,11 +1,11 @@
 label nAlphaCorr
 (
-    readLabel(piso.lookup("nAlphaCorr"))
+    readLabel(pimple.dict().lookup("nAlphaCorr"))
 );
 
 label nAlphaSubCycles
 (
-    readLabel(piso.lookup("nAlphaSubCycles"))
+    readLabel(pimple.dict().lookup("nAlphaSubCycles"))
 );
 
 if (nAlphaSubCycles > 1)
diff --git a/applications/solvers/multiphase/interMixingFoam/createFields.H b/applications/solvers/multiphase/interMixingFoam/createFields.H
index 6fdd34175..5bceabf74 100644
--- a/applications/solvers/multiphase/interMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/interMixingFoam/createFields.H
@@ -135,16 +135,14 @@
 
     label pdRefCell = 0;
     scalar pdRefValue = 0.0;
-    setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
+    setRefCell(pd, pimple.dict(), pdRefCell, pdRefValue);
+    mesh.schemesDict().setFluxRequired(pd.name());
 
     scalar pRefValue = 0.0;
 
     if (pd.needReference())
     {
-        pRefValue = readScalar
-        (
-            mesh.solutionDict().subDict("PISO").lookup("pRefValue")
-        );
+        pRefValue = readScalar(pimple.dict().lookup("pRefValue"));
 
         p += dimensionedScalar
         (
@@ -163,3 +161,5 @@
     (
         incompressible::turbulenceModel::New(U, phi, threePhaseProperties)
     );
+
+    mesh.schemesDict().setFluxRequired(alpha2.name());
diff --git a/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
index 44de8ab5e..fb844be70 100644
--- a/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
+++ b/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
@@ -36,6 +36,7 @@ Description
 #include "threePhaseMixture.H"
 #include "threePhaseInterfaceProperties.H"
 #include "turbulenceModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,8 +45,10 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "readGravitationalAcceleration.H"
-#   include "readPISOControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
 #   include "createTimeControls.H"
@@ -59,7 +62,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-#       include "readPISOControls.H"
 #       include "readTimeControls.H"
 #       include "CourantNo.H"
 #       include "setDeltaT.H"
@@ -76,7 +78,7 @@ int main(int argc, char *argv[])
 #       include "UEqn.H"
 
         // --- PISO loop
-        for (int corr = 0; corr < nCorr; corr++)
+         while (pimple.correct())
         {
 #           include "pEqn.H"
         }
diff --git a/applications/solvers/multiphase/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C b/applications/solvers/multiphase/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
index bf8899fee..a14217572 100644
--- a/applications/solvers/multiphase/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
+++ b/applications/solvers/multiphase/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
@@ -170,7 +170,7 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties
     (
         readScalar
         (
-            mixture.U().mesh().solutionDict().subDict("PISO").lookup("cAlpha")
+            mixture.U().mesh().solutionDict().subDict("PIMPLE").lookup("cAlpha")
         )
     ),
     sigma12_(mixture.lookup("sigma12")),
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H
index c59137c7b..182fa3aad 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H
@@ -17,7 +17,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve
         (
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
index dd1d82803..164941f97 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
@@ -13,12 +13,12 @@ surfaceScalarField rhoPhi
 {
     label nAlphaCorr
     (
-        readLabel(piso.lookup("nAlphaCorr"))
+        readLabel(pimple.dict().lookup("nAlphaCorr"))
     );
 
     label nAlphaSubCycles
     (
-        readLabel(piso.lookup("nAlphaSubCycles"))
+        readLabel(pimple.dict().lookup("nAlphaSubCycles"))
     );
 
     surfaceScalarField phic = mag(phi/mesh.magSf());
@@ -44,7 +44,7 @@ surfaceScalarField rhoPhi
 #       include "alphaEqn.H"
     }
 
-    if (nOuterCorr == 1)
+    if (pimple.nCorrPIMPLE() == 1)
     {
         interface.correct();
     }
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H b/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
index a1cb1bf0a..ec9c54ab4 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
@@ -36,7 +36,7 @@
 
     mesh.schemesDict().setFluxRequired(pcorr.name());
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pcorrEqn
         (
@@ -46,7 +46,7 @@
         pcorrEqn.setReference(pdRefCell, pdRefValue);
         pcorrEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi -= pcorrEqn.flux();
         }
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H
index 50cc07e7a..011e879f7 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H
@@ -103,16 +103,14 @@
 
     label pdRefCell = 0;
     scalar pdRefValue = 0.0;
-    setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
+    setRefCell(pd, pimple.dict(), pdRefCell, pdRefValue);
+    mesh.schemesDict().setFluxRequired(pd.name());
 
     scalar pRefValue = 0.0;
 
     if (pd.needReference())
     {
-        pRefValue = readScalar
-        (
-            mesh.solutionDict().subDict("PISO").lookup("pRefValue")
-        );
+        pRefValue = readScalar(pimple.dict().lookup("pRefValue"));
 
         p += dimensionedScalar
         (
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index de7b70221..e4a3fd563 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -46,6 +46,7 @@ Description
 #include "interfaceProperties.H"
 #include "phaseChangeTwoPhaseMixture.H"
 #include "turbulenceModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -54,8 +55,10 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "readGravitationalAcceleration.H"
-#   include "readPISOControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
 #   include "createTimeControls.H"
@@ -69,7 +72,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-#       include "readPISOControls.H"
 #       include "readTimeControls.H"
 #       include "CourantNo.H"
 #       include "setDeltaT.H"
@@ -83,12 +85,12 @@ int main(int argc, char *argv[])
         turbulence->correct();
 
         // --- Outer-corrector loop
-        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
+        while (pimple.loop())
         {
             #include "UEqn.H"
 
             // --- PISO loop
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
 #               include "pEqn.H"
             }
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
index 622ee6d02..c0c355ee8 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
@@ -24,7 +24,7 @@
     const volScalarField& vDotcP = vDotP[0]();
     const volScalarField& vDotvP = vDotP[1]();
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pdEqn
         (
@@ -34,16 +34,12 @@
 
         pdEqn.setReference(pdRefCell, pdRefValue);
 
-        if (corr == nCorr - 1 && nonOrth == nNonOrthCorr)
-        {
-            pdEqn.solve(mesh.solutionDict().solver(pd.name() + "Final"));
-        }
-        else
-        {
-            pdEqn.solve(mesh.solutionDict().solver(pd.name()));
-        }
+        pdEqn.solve
+        (
+            mesh.solutionDict().solver(pd.select(pimple.finalInnerIter()))
+        );
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi += pdEqn.flux();
         }
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
index ef92fb9bc..4fc9e04a1 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
@@ -65,16 +65,14 @@
 
     label pdRefCell = 0;
     scalar pdRefValue = 0.0;
-    setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
+    setRefCell(pd, pimple.dict(), pdRefCell, pdRefValue);
+    mesh.schemesDict().setFluxRequired(pd.name());
 
     scalar pRefValue = 0.0;
 
     if (pd.needReference())
     {
-        pRefValue = readScalar
-        (
-            mesh.solutionDict().subDict("PISO").lookup("pRefValue")
-        );
+        pRefValue = readScalar(pimple.dict().lookup("pRefValue"));
 
         p += dimensionedScalar
         (
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index d85538315..abc18504f 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -35,6 +35,7 @@ Description
 #include "fvCFD.H"
 #include "multiphaseMixture.H"
 #include "turbulenceModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,8 +44,10 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "readGravitationalAcceleration.H"
-#   include "readPISOControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
 #   include "createTimeControls.H"
@@ -58,7 +61,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-#       include "readPISOControls.H"
 #       include "readTimeControls.H"
 #       include "CourantNo.H"
 #       include "setDeltaT.H"
@@ -73,7 +75,7 @@ int main(int argc, char *argv[])
 #       include "UEqn.H"
 
         // --- PISO loop
-        for (int corr = 0; corr < nCorr; corr++)
+        while (pimple.correct())
         {
 #           include "pEqn.H"
         }
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index 7f0920834..952853472 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -265,23 +265,23 @@ void Foam::multiphaseMixture::correct()
     (
         readLabel
         (
-            mesh_.solutionDict().subDict("PISO").lookup("nAlphaSubCycles")
+            mesh_.solutionDict().subDict("PIMPLE").lookup("nAlphaSubCycles")
         )
     );
 
     label nAlphaCorr
     (
-        readLabel(mesh_.solutionDict().subDict("PISO").lookup("nAlphaCorr"))
+        readLabel(mesh_.solutionDict().subDict("PIMPLE").lookup("nAlphaCorr"))
     );
 
     bool cycleAlpha
     (
-        Switch(mesh_.solutionDict().subDict("PISO").lookup("cycleAlpha"))
+        Switch(mesh_.solutionDict().subDict("PIMPLE").lookup("cycleAlpha"))
     );
 
     scalar cAlpha
     (
-        readScalar(mesh_.solutionDict().subDict("PISO").lookup("cAlpha"))
+        readScalar(mesh_.solutionDict().subDict("PIMPLE").lookup("cAlpha"))
     );
 
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H b/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
index 92148f9fc..a08614b1f 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
@@ -18,7 +18,7 @@
 
     adjustPhi(phi, U, pd);
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pdEqn
         (
@@ -27,16 +27,12 @@
 
         pdEqn.setReference(pdRefCell, pdRefValue);
 
-        if (corr == nCorr - 1)
-        {
-            pdEqn.solve(mesh.solutionDict().solver(pd.name() + "Final"));
-        }
-        else
-        {
-            pdEqn.solve(mesh.solutionDict().solver(pd.name()));
-        }
+        pdEqn.solve
+        (
+            mesh.solutionDict().solver(pd.select(pimple.finalInnerIter()))
+        );
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi -= pdEqn.flux();
         }
diff --git a/applications/solvers/multiphase/porousInterFoam/UEqn.H b/applications/solvers/multiphase/porousInterFoam/UEqn.H
index efb1df5ea..bc6ff4589 100644
--- a/applications/solvers/multiphase/porousInterFoam/UEqn.H
+++ b/applications/solvers/multiphase/porousInterFoam/UEqn.H
@@ -21,7 +21,7 @@
 
     pZones.addResistance(UEqn);
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve
         (
diff --git a/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C b/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C
index 6976ea5a9..ae698dbbc 100644
--- a/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C
+++ b/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C
@@ -45,6 +45,7 @@ Description
 #include "twoPhaseMixture.H"
 #include "turbulenceModel.H"
 #include "porousZones.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,8 +54,10 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "readGravitationalAcceleration.H"
-#   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
 #   include "createPorousZones.H"
@@ -69,7 +72,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-#       include "readPIMPLEControls.H"
 #       include "readTimeControls.H"
 #       include "CourantNo.H"
 #       include "setDeltaT.H"
@@ -79,8 +81,7 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         // Pressure-velocity corrector
-        int oCorr = 0;
-        do
+        while (pimple.loop())
         {
             twoPhaseProperties.correct();
 
@@ -89,7 +90,7 @@ int main(int argc, char *argv[])
 #           include "UEqn.H"
 
             // --- PISO loop
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
 #               include "pEqn.H"
             }
@@ -97,7 +98,7 @@ int main(int argc, char *argv[])
 #           include "continuityErrs.H"
 
             turbulence->correct();
-        } while (++oCorr < nOuterCorr);
+        }
 
         runTime.write();
 
diff --git a/applications/solvers/multiphase/settlingFoam/UEqn.H b/applications/solvers/multiphase/settlingFoam/UEqn.H
index 8dba5041c..6bec880d1 100644
--- a/applications/solvers/multiphase/settlingFoam/UEqn.H
+++ b/applications/solvers/multiphase/settlingFoam/UEqn.H
@@ -12,7 +12,7 @@ fvVectorMatrix UEqn
   - fvm::laplacian(mu, U, "laplacian(muEff,U)")
 );
 
-if (momentumPredictor)
+if (pimple.momentumPredictor())
 {
     solve
     (
diff --git a/applications/solvers/multiphase/settlingFoam/compressibleContinuityErrs.H b/applications/solvers/multiphase/settlingFoam/compressibleContinuityErrs.H
index 428465ddd..0593cfe8d 100644
--- a/applications/solvers/multiphase/settlingFoam/compressibleContinuityErrs.H
+++ b/applications/solvers/multiphase/settlingFoam/compressibleContinuityErrs.H
@@ -1,4 +1,4 @@
-    scalar sumLocalContErr =
+    sumLocalContErr =
         runTime.deltaT().value()*
         mag
         (
@@ -6,7 +6,7 @@
           + fvc::div(phi)
         )().weightedAverage(rho*mesh.V()).value();
 
-    scalar globalContErr =
+    globalContErr =
           runTime.deltaT().value()*
           (
               fvc::ddt(rho)
diff --git a/applications/solvers/multiphase/settlingFoam/createFields.H b/applications/solvers/multiphase/settlingFoam/createFields.H
index 400f89c43..57f62457b 100644
--- a/applications/solvers/multiphase/settlingFoam/createFields.H
+++ b/applications/solvers/multiphase/settlingFoam/createFields.H
@@ -133,8 +133,8 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
-
+    setRefCell(p, pimple.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
     Info<< "Calculating field mul\n" << endl;
     volScalarField mul
diff --git a/applications/solvers/multiphase/settlingFoam/pEqn.H b/applications/solvers/multiphase/settlingFoam/pEqn.H
index 65b954c6d..5c1ee980b 100644
--- a/applications/solvers/multiphase/settlingFoam/pEqn.H
+++ b/applications/solvers/multiphase/settlingFoam/pEqn.H
@@ -17,7 +17,7 @@ phi =
 surfaceScalarField phiU("phiU", phi);
 phi -= ghf*fvc::snGrad(rho)*rUAf*mesh.magSf();
 
-for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+while (pimple.correctNonOrthogonal())
 {
     fvScalarMatrix pEqn
     (
@@ -27,7 +27,7 @@ for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     pEqn.setReference(pRefCell, pRefValue);
     pEqn.solve();
 
-    if (nonOrth == nNonOrthCorr)
+    if (pimple.finalNonOrthogonalIter())
     {
         phi -= pEqn.flux();
     }
diff --git a/applications/solvers/multiphase/settlingFoam/settlingFoam.C b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
index f75769fee..7b6b153cb 100644
--- a/applications/solvers/multiphase/settlingFoam/settlingFoam.C
+++ b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
@@ -37,6 +37,7 @@ Description
 #include "Switch.H"
 #include "plasticViscosity.H"
 #include "yieldStress.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,6 +47,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
@@ -59,12 +63,11 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPISOControls.H"
 #       include "compressibleCourantNo.H"
 
 #       include "rhoEqn.H"
 
-        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
+        while (pimple.loop())
         {
 #           include "calcVdj.H"
 
@@ -75,7 +78,7 @@ int main(int argc, char *argv[])
 #           include "correctViscosity.H"
 
             // --- PISO loop
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
 #               include "pEqn.H"
             }
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
index b6a7bb6ed..0c7ea9900 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
@@ -14,23 +14,12 @@
     //- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
     );
 
-    if (oCorr == nOuterCorr-1)
-    {
-        if (mesh.solutionDict().relax("UFinal"))
-        {
-            UEqn.relax(mesh.solutionDict().relaxationFactor("UFinal"));
-        }
-        else
-        {
-            UEqn.relax(1);
-        }
-    }
-    else
-    {
-        UEqn.relax();
-    }
+    UEqn.relax
+    (
+        mesh.solutionDict().equationRelaxationFactor(U.select(pimple.finalIter()))
+    );
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve
         (
@@ -40,6 +29,6 @@
             (
                 (- ghf*fvc::snGrad(rho) - fvc::snGrad(p_rgh))*mesh.magSf()
             ),
-            mesh.solutionDict().solver(oCorr == nOuterCorr-1 ? "UFinal" : "U")
+            mesh.solutionDict().solver((U.select(pimple.finalIter())))
         );
     }
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
index 7cd78a521..ab04cf514 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
@@ -93,22 +93,14 @@
 
     label p_rghRefCell = 0;
     scalar p_rghRefValue = 0.0;
-    setRefCell
-    (
-        p_rgh,
-        mesh.solutionDict().subDict("PIMPLE"),
-        p_rghRefCell,
-        p_rghRefValue
-    );
+    setRefCell(p_rgh, pimple.dict(), p_rghRefCell, p_rghRefValue);
+    mesh.schemesDict().setFluxRequired(p_rgh.name());
 
     scalar pRefValue = 0.0;
 
     if (p_rgh.needReference())
     {
-        pRefValue = readScalar
-        (
-            mesh.solutionDict().subDict("PIMPLE").lookup("pRefValue")
-        );
+        pRefValue = readScalar(pimple.dict().lookup("pRefValue"));
 
         p += dimensionedScalar
         (
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/p_rghEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/p_rghEqn.H
index fb3653730..f5e2acfc9 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/p_rghEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/p_rghEqn.H
@@ -13,7 +13,7 @@
 
     phi = phiU - ghf*fvc::snGrad(rho)*rUAf*mesh.magSf();
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix p_rghEqn
         (
@@ -24,14 +24,10 @@
 
         p_rghEqn.solve
         (
-            mesh.solutionDict().solver
-            (
-                p_rgh.name()
-              + ((corr == nCorr - 1 && nonOrth == nNonOrthCorr) ? "Final" : "")
-            )
+            mesh.solutionDict().solver(p_rgh.select(pimple.finalInnerIter()))
         );
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi -= p_rghEqn.flux();
         }
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index 861a0b0d3..00137e7ce 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -34,6 +34,7 @@ Description
 #include "fvCFD.H"
 #include "twoPhaseMixture.H"
 #include "turbulenceModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -42,8 +43,10 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "readGravitationalAcceleration.H"
-#   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
 #   include "createTimeControls.H"
@@ -56,7 +59,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-#       include "readPIMPLEControls.H"
 #       include "readTimeControls.H"
 #       include "CourantNo.H"
 #       include "setDeltaT.H"
@@ -66,7 +68,7 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
+        while (pimple.loop())
         {
             twoPhaseProperties.correct();
 
@@ -75,7 +77,7 @@ int main(int argc, char *argv[])
 #           include "UEqn.H"
 
             // --- PISO loop
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
 #               include "p_rghEqn.H"
             }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
index 1fdaf944b..0a2d24ed6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
@@ -355,4 +355,5 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
index ade4ce0b3..1fe6cbfed 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
@@ -47,7 +47,7 @@
 
     surfaceScalarField Dp("(rho*(1|A(U)))", alphaf*rUaAf/rhoa + betaf*rUbAf/rhob);
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (piso.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -57,7 +57,7 @@
         pEqn.setReference(pRefCell, pRefValue);
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (piso.finalNonOrthogonalIter())
         {
             surfaceScalarField SfGradp = pEqn.flux()/Dp;
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/readTwoPhaseEulerFoamControls.H b/applications/solvers/multiphase/twoPhaseEulerFoam/readTwoPhaseEulerFoamControls.H
index b95633638..325466090 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/readTwoPhaseEulerFoamControls.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/readTwoPhaseEulerFoamControls.H
@@ -1,6 +1,5 @@
 #   include "readTimeControls.H"
-#   include "readPISOControls.H"
 
-    int nAlphaCorr(readInt(piso.lookup("nAlphaCorr")));
+    int nAlphaCorr(readInt(piso.dict().lookup("nAlphaCorr")));
 
-    Switch correctAlpha(piso.lookup("correctAlpha"));
+    Switch correctAlpha(piso.dict().lookup("correctAlpha"));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index 321829c31..47e3dede2 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -41,6 +41,7 @@ Description
 #include "dragModel.H"
 #include "phaseModel.H"
 #include "kineticTheoryModel.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,6 +51,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "readPPProperties.H"
@@ -78,11 +82,11 @@ int main(int argc, char *argv[])
 #       include "UEqns.H"
 
         // --- PISO loop
-        for (int corr = 0; corr < nCorr; corr++)
+        while (piso.correct())
         {
 #           include "pEqn.H"
 
-            if (correctAlpha && corr < nCorr - 1)
+            if (correctAlpha && !piso.finalInnerIter())
             {
 #               include "alphaEqn.H"
             }
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/createFields.H b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/createFields.H
index 0e1e4a701..461709e4b 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/createFields.H
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/createFields.H
@@ -56,4 +56,5 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/icoFsiFoam.C b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/icoFsiFoam.C
index edb207fb7..7904ad652 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/icoFsiFoam.C
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/icoFsiFoam.C
@@ -39,6 +39,7 @@ Description
 #include "faceTetPolyPatch.H"
 #include "tetPolyPatchInterpolation.H"
 #include "fixedValueTetPolyPatchFields.H"
+#include "pisoControl.H"
 
 #include "pointMesh.H"
 #include "pointFields.H"
@@ -51,6 +52,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createDynamicFvMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "createStressMesh.H"
 #   include "createFields.H"
 #   include "createStressFields.H"
@@ -66,7 +70,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-#       include "readPISOControls.H"
 #       include "readTimeControls.H"
 #       include "CourantNo.H"
 #       include "setDeltaT.H"
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/solveFluid.H b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/solveFluid.H
index 3bff19d5d..5bd1c86a3 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/solveFluid.H
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/solveFluid.H
@@ -1,7 +1,7 @@
 {
     // SIMPLE loop
 
-    for (int corr=0; corr<nCorr; corr++)
+    while (piso.correct())
     {
         fvVectorMatrix UEqn
         (
@@ -23,7 +23,7 @@
 
         p.storePrevIter();
 
-        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+        while (piso.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
@@ -33,7 +33,7 @@
             pEqn.setReference(pRefCell, pRefValue);
             pEqn.solve();
 
-            if (nonOrth == nNonOrthCorr)
+            if (piso.finalNonOrthogonalIter())
             {
                 phi -= pEqn.flux();
             }
diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createFields.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createFields.H
index 1cb2fc676..1f930006d 100644
--- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createFields.H
+++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createFields.H
@@ -58,7 +58,8 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
 //     pRefCell = mesh.findNearestCell(vector(0,0.205,0));
 //     Info << "Ref. cell: " << pRefCell << endl;
diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/icoFsiElasticNonLinULSolidFoam.C b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/icoFsiElasticNonLinULSolidFoam.C
index bdea491a8..231e4ad1a 100644
--- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/icoFsiElasticNonLinULSolidFoam.C
+++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/icoFsiElasticNonLinULSolidFoam.C
@@ -64,6 +64,7 @@ Author
 #include "scalarIOField.H"
 #include "leastSquaresVolPointInterpolation.H"
 #include "symmetryPolyPatch.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -72,6 +73,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createDynamicFvMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "createFields.H"
 #   include "createStressMesh.H"
 #   include "createStressFields.H"
@@ -88,8 +92,6 @@ int main(int argc, char *argv[])
     {
         Info << "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPISOControls.H"
-
 #       include "readFsiControls.H"
 
 #       include "createStressPointMesh.H"
@@ -117,7 +119,7 @@ int main(int argc, char *argv[])
         while
         (
             (fsiResidualNorm > outerCorrTolerance)
-         && (outerCorr < nOuterCorr)
+         && (outerCorr < piso.nCorrPIMPLE())
         );
 
         Vs += DV;
diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/solveFluid.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/solveFluid.H
index 0364805a5..dc237463e 100644
--- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/solveFluid.H
+++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/solveFluid.H
@@ -19,14 +19,14 @@
         // --- PISO loop
         volScalarField rUA = 1.0/UEqn.A();
 
-        for (int corr=0; corr<nCorr; corr++)
+        while (piso.correct())
         {
             U = rUA*UEqn.H();
             phi = (fvc::interpolate(U) & mesh.Sf());
 
             adjustPhi(phi, U, p);
 
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            while (piso.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
@@ -37,7 +37,7 @@
                 pEqn.setReference(pRefCell, pRefValue);
                 pEqn.solve();
 
-                if (nonOrth == nNonOrthCorr)
+                if (piso.finalNonOrthogonalIter())
                 {
                     phi -= pEqn.flux();
                 }
diff --git a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/bubbleInterTrackFoam.C b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/bubbleInterTrackFoam.C
index 88ef19848..e47aac371 100644
--- a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/bubbleInterTrackFoam.C
+++ b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/bubbleInterTrackFoam.C
@@ -37,7 +37,7 @@ Description
 #include "inletOutletFvPatchFields.H"
 #include "fixedGradientFvPatchFields.H"
 #include "boundBox.H"
-
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,6 +46,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createDynamicFvMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 #   include "createBubble.H"
@@ -59,8 +62,6 @@ int main(int argc, char *argv[])
     {
         Info << "Time = " << runTime.value() << endl << endl;
 
-#       include "readPISOControls.H"
-
         interface.moveMeshPointsForOldFreeSurfDisplacement();
 
         interface.updateDisplacementDirections();
@@ -70,7 +71,7 @@ int main(int argc, char *argv[])
         Info<< "\nMax surface Courant Number = "
             << interface.maxCourantNumber() << endl << endl;
 
-        for (int corr=0; corr<nOuterCorr; corr++)
+        while (pimple.loop())
         {
             // Update interface bc
             interface.updateBoundaryConditions();
@@ -91,7 +92,7 @@ int main(int argc, char *argv[])
             solve(UEqn == -fvc::grad(p));
 
             // --- PISO loop
-            for (int i=0; i<nCorr; i++)
+            while (pimple.correct())
             {
                 volScalarField AU = UEqn.A();
 
@@ -104,7 +105,7 @@ int main(int argc, char *argv[])
 #               include "scaleSpacePhi.H"
 
                 // Non-orthogonal pressure corrector loop
-                for (label nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+                while (pimple.correctNonOrthogonal())
                 {
                     fvScalarMatrix pEqn
                     (
@@ -116,7 +117,7 @@ int main(int argc, char *argv[])
 
                     pEqn.solve();
 
-                    if (nonOrth == nNonOrthCorr)
+                    if (pimple.finalNonOrthogonalIter())
                     {
                         phi -= pEqn.flux();
                     }
diff --git a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/createFields.H b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/createFields.H
index 25256d07a..a14fdb66f 100644
--- a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/createFields.H
+++ b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/createFields.H
@@ -122,3 +122,4 @@ if (interface.twoFluids())
 
 #   include "setRefCell.H"
 
+mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/surfaceTracking/include/setRefCell.H b/applications/solvers/surfaceTracking/include/setRefCell.H
index c50161301..3bd7f2330 100644
--- a/applications/solvers/surfaceTracking/include/setRefCell.H
+++ b/applications/solvers/surfaceTracking/include/setRefCell.H
@@ -28,7 +28,7 @@ pNeedRef = returnReduce<bool>(pNeedRef, andOp<bool>());
 // Find reference cell
 if (pNeedRef)
 {
-    point refPointi(mesh.solutionDict().subDict("PISO").lookup("pRefPoint"));
+    point refPointi(mesh.solutionDict().subDict("PIMPLE").lookup("pRefPoint"));
     label refCelli = mesh.findCell(refPointi);
     label hasRef = (refCelli >= 0 ? 1 : 0);
     label sumHasRef = returnReduce<label>(hasRef, sumOp<label>());
@@ -50,6 +50,6 @@ if (pNeedRef)
     }
 
     pRefValue =
-        readScalar(mesh.solutionDict().subDict("PISO").lookup("pRefValue"));
+        readScalar(mesh.solutionDict().subDict("PIMPLE").lookup("pRefValue"));
 }
 
diff --git a/applications/solvers/surfaceTracking/interTrackFoam/createFields.H b/applications/solvers/surfaceTracking/interTrackFoam/createFields.H
index 7ecde62de..55b55a63f 100644
--- a/applications/solvers/surfaceTracking/interTrackFoam/createFields.H
+++ b/applications/solvers/surfaceTracking/interTrackFoam/createFields.H
@@ -121,3 +121,4 @@ if (interface.twoFluids())
 
 #   include "setRefCell.H"
 
+mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/surfaceTracking/interTrackFoam/interTrackFoam.C b/applications/solvers/surfaceTracking/interTrackFoam/interTrackFoam.C
index 3873525da..8fcca7da2 100644
--- a/applications/solvers/surfaceTracking/interTrackFoam/interTrackFoam.C
+++ b/applications/solvers/surfaceTracking/interTrackFoam/interTrackFoam.C
@@ -34,7 +34,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "freeSurface.H"
-
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,6 +46,8 @@ int main(int argc, char *argv[])
 
 #   include "createDynamicFvMesh.H"
 
+    pimpleControl pimple(mesh);
+
 #   include "createFields.H"
 
 #   include "initContinuityErrs.H"
@@ -58,8 +60,6 @@ int main(int argc, char *argv[])
     {
         Info << "Time = " << runTime.value() << endl << endl;
 
-#       include "readPISOControls.H"
-
         interface.moveMeshPointsForOldFreeSurfDisplacement();
 
         interface.updateDisplacementDirections();
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
         Info<< "\nMax surface Courant Number = "
             << interface.maxCourantNumber() << endl << endl;
 
-        for (int corr=0; corr<nOuterCorr; corr++)
+        while (pimple.loop())
         {
             // Update interface bc
             interface.updateBoundaryConditions();
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
             solve(UEqn == -fvc::grad(p));
 
             // --- PISO loop
-            for (int i=0; i<nCorr; i++)
+            while (pimple.correct())
             {
                 volScalarField AU = UEqn.A();
 
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
 #               include "scalePhi.H"
 
                 // Non-orthogonal pressure corrector loop
-                for (label nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+                while (pimple.correctNonOrthogonal())
                 {
                     fvScalarMatrix pEqn
                     (
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
 
                     pEqn.solve();
 
-                    if (nonOrth == nNonOrthCorr)
+                    if (pimple.finalNonOrthogonalIter())
                     {
                         phi -= pEqn.flux();
                     }
diff --git a/applications/solvers/viscoelastic/viscoelasticFluidFoam/createFields.H b/applications/solvers/viscoelastic/viscoelasticFluidFoam/createFields.H
index 3c0d889fa..62930834d 100644
--- a/applications/solvers/viscoelastic/viscoelasticFluidFoam/createFields.H
+++ b/applications/solvers/viscoelastic/viscoelasticFluidFoam/createFields.H
@@ -31,7 +31,8 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    setRefCell(p, piso.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
     // Create viscoelastic model
     viscoelasticModel visco(U, phi);
diff --git a/applications/solvers/viscoelastic/viscoelasticFluidFoam/viscoelasticFluidFoam.C b/applications/solvers/viscoelastic/viscoelasticFluidFoam/viscoelasticFluidFoam.C
index a8de7e9ae..2aac0e90a 100644
--- a/applications/solvers/viscoelastic/viscoelasticFluidFoam/viscoelasticFluidFoam.C
+++ b/applications/solvers/viscoelastic/viscoelasticFluidFoam/viscoelasticFluidFoam.C
@@ -34,6 +34,7 @@ Author
 
 #include "fvCFD.H"
 #include "viscoelasticModel.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,6 +45,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 #   include "createTimeControls.H"
@@ -55,7 +59,6 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
 
-#       include "readPISOControls.H"
 #       include "readTimeControls.H"
 #       include "CourantNo.H"
 #       include "setDeltaT.H"
@@ -65,7 +68,7 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         // Pressure-velocity SIMPLE corrector loop
-        for (int corr = 0; corr < nCorr; corr++)
+        while (piso.correct())
         {
             // Momentum predictor
 
@@ -90,7 +93,7 @@ int main(int argc, char *argv[])
             p.storePrevIter();
 
             // Non-orthogonal pressure corrector loop
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            while (piso.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
@@ -100,7 +103,7 @@ int main(int argc, char *argv[])
                 pEqn.setReference(pRefCell, pRefValue);
                 pEqn.solve();
 
-                if (nonOrth == nNonOrthCorr)
+                if (piso.finalNonOrthogonalIter())
                 {
                     phi -= pEqn.flux();
                 }
diff --git a/applications/utilities/errorEstimation/simpleFoamResidual/createFields.H b/applications/utilities/errorEstimation/simpleFoamResidual/createFields.H
index ab4249625..239a6938f 100644
--- a/applications/utilities/errorEstimation/simpleFoamResidual/createFields.H
+++ b/applications/utilities/errorEstimation/simpleFoamResidual/createFields.H
@@ -31,7 +31,8 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
 
     singlePhaseTransportModel laminarTransport(U, phi);
diff --git a/applications/utilities/errorEstimation/simpleFoamResidual/simpleFoamResidual.C b/applications/utilities/errorEstimation/simpleFoamResidual/simpleFoamResidual.C
index 8dfeb8fbe..322b98b4b 100644
--- a/applications/utilities/errorEstimation/simpleFoamResidual/simpleFoamResidual.C
+++ b/applications/utilities/errorEstimation/simpleFoamResidual/simpleFoamResidual.C
@@ -35,6 +35,7 @@ Description
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "RASModel.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,6 +51,8 @@ int main(int argc, char *argv[])
 
 #   include "createMesh.H"
 
+    simpleControl simple(mesh);
+
     forAll(timeDirs, timeI)
     {
         runTime.setTime(timeDirs[timeI], timeI);
diff --git a/applications/utilities/postProcessing/stressField/interFoamPressure/interFoamPressure.C b/applications/utilities/postProcessing/stressField/interFoamPressure/interFoamPressure.C
index b38300051..c05f65221 100644
--- a/applications/utilities/postProcessing/stressField/interFoamPressure/interFoamPressure.C
+++ b/applications/utilities/postProcessing/stressField/interFoamPressure/interFoamPressure.C
@@ -35,6 +35,7 @@ Description
 #include "fvCFD.H"
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -55,19 +56,14 @@ int main(int argc, char *argv[])
     runTime.setTime(Times[startTime], startTime);
 
 #   include "createMesh.H"
-#   include "readGravitationalAcceleration.H"
 
-    const dictionary& piso = mesh.solutionDict().subDict("PISO");
+    pisoControl piso(mesh);
+
+#   include "readGravitationalAcceleration.H"
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
 
-    int nNonOrthCorr = 0;
-    if (piso.found("nNonOrthogonalCorrectors"))
-    {
-        nNonOrthCorr = readInt(piso.lookup("nNonOrthogonalCorrectors"));
-    }
-
     for (label i = startTime; i < endTime; i++)
     {
         runTime.setTime(Times[i], i);
@@ -195,7 +191,8 @@ int main(int argc, char *argv[])
                 pd
             );
 
-            setRefCell(p, piso, pRefCell, pRefValue);
+            setRefCell(p, piso.dict(), pRefCell, pRefValue);
+            mesh.schemesDict().setFluxRequired(p.name());
 
             volScalarField rUA = 1.0/UEqn.A();
             surfaceScalarField rUAf = fvc::interpolate(rUA);
@@ -204,7 +201,7 @@ int main(int argc, char *argv[])
 
             phi = fvc::interpolate(U) & mesh.Sf();
 
-            for(int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+            while (piso.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index abc3eea8b..7db1c434f 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -1011,7 +1011,7 @@ bool Foam::ping(const word& hostname, const label timeOut)
 }
 
 
-int Foam::system(const string& command)
+int Foam::system(const std::string& command)
 {
     return ::system(command.c_str());
 }
diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrix.C b/src/finiteArea/faMatrices/faMatrix/faMatrix.C
index 1f5c9a5f5..ae1ce299e 100644
--- a/src/finiteArea/faMatrices/faMatrix/faMatrix.C
+++ b/src/finiteArea/faMatrices/faMatrix/faMatrix.C
@@ -548,16 +548,18 @@ void faMatrix<Type>::relax(const scalar alpha)
 template<class Type>
 void faMatrix<Type>::relax()
 {
-    scalar alpha = 0;
-
-    if (psi_.mesh().solutionDict().relax(psi_.name()))
+    if (psi_.mesh().solutionDict().relaxEquation(psi_.name()))
     {
-        alpha = psi_.mesh().solutionDict().relaxationFactor(psi_.name());
+        relax(psi_.mesh().solutionDict().equationRelaxationFactor(psi_.name()));
     }
-
-    if (alpha > 0)
+    else
     {
-        relax(alpha);
+        if (debug)
+        {
+            InfoIn("void faMatrix<Type>::relax()")
+                << "Relaxation factor for field " << psi_.name()
+                << " not found.  Relaxation will not be used." << endl;
+        }
     }
 }
 
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
index b0d36cc3f..149d5b54e 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "solutionControl.H"
+#include "lduMatrix.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -191,7 +192,7 @@ void Foam::solutionControl::maxTypeResidual
 
     if (mesh_.foundObject<fieldType>(fieldName))
     {
-        const List<SolverPerformance<Type> > sp(data);
+        const List<lduSolverPerformance> sp(data);
         firstRes = cmptMax(sp.first().initialResidual());
         lastRes = cmptMax(sp.last().initialResidual());
     }
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlTemplates.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlTemplates.C
index 011c8af5f..152562216 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlTemplates.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlTemplates.C
@@ -45,7 +45,11 @@ void Foam::solutionControl::storePrevIter() const
 
         size_t prevIterField = fName.find("PrevIter");
 
-        if ((prevIterField == word::npos) && mesh_.solutionDict().relax(fName))
+        if
+        (
+            (prevIterField == word::npos)
+         && mesh_.solutionDict().relaxField(fName)
+        )
         {
             if (debug)
             {
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index e52be5a91..79802028a 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -696,9 +696,9 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
 template<class Type>
 void Foam::fvMatrix<Type>::relax()
 {
-    if (psi_.mesh().solutionDict().relax(psi_.name()))
+    if (psi_.mesh().solutionDict().relaxEquation(psi_.name()))
     {
-        relax(psi_.mesh().solutionDict().relaxationFactor(psi_.name()));
+        relax(psi_.mesh().solutionDict().equationRelaxationFactor(psi_.name()));
     }
     else
     {
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
index 089cf34fe..a37678fb4 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
@@ -170,6 +170,8 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solve
 
     psi.correctBoundaryConditions();
 
+    psi_.mesh().setSolverPerformance(psi_.name(), solverPerfVec);
+
     return solverPerfVec;
 }
 
diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
index 4986dfc48..c618525a4 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
@@ -104,6 +104,8 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Foam::scalar>::solve
 
     psi.correctBoundaryConditions();
 
+    psi_.mesh().setSolverPerformance(psi_.name(), solverPerf);
+
     return solverPerf;
 }
 
diff --git a/src/foam/fields/GeometricFields/GeometricField/GeometricField.C b/src/foam/fields/GeometricFields/GeometricField/GeometricField.C
index d8bcf09d7..1dfc0c2c8 100644
--- a/src/foam/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/foam/fields/GeometricFields/GeometricField/GeometricField.C
@@ -666,7 +666,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
     if (debug)
     {
         Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
-               "constructing as copy resetting IO params"
+               "constructing as copy resetting IO params and patch types"
             << endl << this->info() << endl;
     }
 
@@ -911,6 +911,20 @@ bool Foam::GeometricField<Type, PatchField, GeoMesh>::needReference() const
 template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::GeometricField<Type, PatchField, GeoMesh>::relax(const scalar alpha)
 {
+    if(alpha <= 0)
+    {
+        return;
+    }
+
+    //if (debug)
+    {
+        InfoIn
+        (
+            "GeometricField<Type, PatchField, GeoMesh>::relax"
+            "(const scalar alpha)"
+        )  << "Relaxing" << endl << this->info() << " by " << alpha << endl;
+    }
+
     operator==(prevIter() + alpha*(*this - prevIter()));
 }
 
@@ -918,16 +932,11 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::relax(const scalar alpha)
 template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::GeometricField<Type, PatchField, GeoMesh>::relax()
 {
-    scalar alpha = 0;
+    word name = this->name();
 
-    if (this->mesh().solutionDict().relax(this->name()))
+    if (this->mesh().solutionDict().relaxField(name))
     {
-        alpha = this->mesh().solutionDict().relaxationFactor(this->name());
-    }
-
-    if (alpha > 0)
-    {
-        relax(alpha);
+        relax(this->mesh().solutionDict().fieldRelaxationFactor(name));
     }
 }
 
@@ -949,6 +958,19 @@ Foam::word Foam::GeometricField<Type, PatchField, GeoMesh>::select
 }
 
 
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::GeometricField<Type, PatchField, GeoMesh>::writeMinMax
+(
+    Ostream& os
+) const
+{
+    os  << "min/max(" << this->name() << ") = "
+        << Foam::min(*this).value() << ", "
+        << Foam::max(*this).value()
+        << endl;
+}
+
+
 // writeData member function required by regIOobject
 template<class Type, template<class> class PatchField, class GeoMesh>
 bool Foam::GeometricField<Type, PatchField, GeoMesh>::
diff --git a/src/foam/fields/GeometricFields/GeometricField/GeometricField.H b/src/foam/fields/GeometricFields/GeometricField/GeometricField.H
index 6bfd6e31a..36a34e8f8 100644
--- a/src/foam/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/foam/fields/GeometricFields/GeometricField/GeometricField.H
@@ -491,14 +491,17 @@ public:
         //  alpha = 0 : do nothing
         void relax(const scalar alpha);
 
+        //- Relax field (for steady-state solution).
+        //  alpha is read from controlDict
+        void relax();
+
         //- Select the final iteration parameters if 'final' is true
         //  by returning the field name + "Final"
         //  otherwise the standard parameters by returning the field name
         word select(bool final) const;
 
-        //- Relax field (for steady-state solution).
-        //  alpha is read from controlDict
-        void relax();
+        //- Helper function to write the min and max to an Ostream
+        void writeMinMax(Ostream& os) const;
 
 
     // Member function *this operators
diff --git a/src/foam/include/OSspecific.H b/src/foam/include/OSspecific.H
index ed66cc66c..2b3afb06e 100644
--- a/src/foam/include/OSspecific.H
+++ b/src/foam/include/OSspecific.H
@@ -173,7 +173,7 @@ bool ping(const word&, const label port, const label timeOut);
 bool ping(const word&, const label timeOut = 10);
 
 //- Execute the specified command
-int system(const string& command);
+int system(const std::string& command);
 
 // Low level random numbers. Use Random class instead.
 
diff --git a/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.C b/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.C
deleted file mode 100644
index 90136bed7..000000000
--- a/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.C
+++ /dev/null
@@ -1,240 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     3.2
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "SolverPerformance.H"
-#include "IOstreams.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-template<class Type>
-bool Foam::SolverPerformance<Type>::checkSingularity
-(
-    const Type& wApA
-)
-{
-    for(direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
-    {
-        singular_[cmpt] =
-            component(wApA, cmpt) < vsmall_;
-    }
-
-    return singular();
-}
-
-
-template<class Type>
-bool Foam::SolverPerformance<Type>::singular() const
-{
-    for(direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
-    {
-        if (!singular_[cmpt]) return false;
-    }
-
-    return true;
-}
-
-
-template<class Type>
-bool Foam::SolverPerformance<Type>::checkConvergence
-(
-    const Type& Tolerance,
-    const Type& RelTolerance
-)
-{
-    if (debug >= 2)
-    {
-        Info<< solverName_
-            << ":  Iteration " << noIterations_
-            << " residual = " << finalResidual_
-            << endl;
-    }
-
-    if
-    (
-        finalResidual_ < Tolerance
-     || (
-            RelTolerance
-          > small_*pTraits<Type>::one
-         && finalResidual_ < cmptMultiply(RelTolerance, initialResidual_)
-        )
-    )
-    {
-        converged_ = true;
-    }
-    else
-    {
-        converged_ = false;
-    }
-
-    return converged_;
-}
-
-
-template<class Type>
-void Foam::SolverPerformance<Type>::print
-(
-    Ostream& os
-) const
-{
-    for(direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
-    {
-        if (pTraits<Type>::nComponents == 1)
-        {
-            os  << solverName_ << ":  Solving for " << fieldName_;
-
-        }
-        else
-        {
-            os  << solverName_ << ":  Solving for "
-                << word(fieldName_ + pTraits<Type>::componentNames[cmpt]);
-        }
-
-        if (singular_[cmpt])
-        {
-            os  << ":  solution singularity" << endl;
-        }
-        else
-        {
-            os  << ", Initial residual = " << component(initialResidual_, cmpt)
-                << ", Final residual = " << component(finalResidual_, cmpt)
-                << ", No Iterations " << noIterations_
-                << endl;
-        }
-    }
-}
-
-
-template<class Type>
-void Foam::SolverPerformance<Type>::replace
-(
-    const Foam::label cmpt,
-    const Foam::SolverPerformance<typename pTraits<Type>::cmptType>& sp
-)
-{
-    initialResidual_.replace(cmpt, sp.initialResidual());
-    finalResidual_.replace(cmpt, sp.finalResidual());
-    singular_[cmpt] = sp.singular();
-}
-
-
-template<class Type>
-Foam::SolverPerformance<typename Foam::pTraits<Type>::cmptType>
-Foam::SolverPerformance<Type>::max()
-{
-    return SolverPerformance<typename pTraits<Type>::cmptType>
-    (
-        solverName_,
-        fieldName_,
-        cmptMax(initialResidual_),
-        cmptMax(finalResidual_),
-        noIterations_,
-        converged_,
-        singular()
-    );
-}
-
-
-template<class Type>
-bool Foam::SolverPerformance<Type>::operator!=
-(
-    const SolverPerformance<Type>& sp
-) const
-{
-    return
-    (
-        solverName()      != sp.solverName()
-     || fieldName()       != sp.fieldName()
-     || initialResidual() != sp.initialResidual()
-     || finalResidual()   != sp.finalResidual()
-     || nIterations()     != sp.nIterations()
-     || converged()       != sp.converged()
-     || singular()        != sp.singular()
-    );
-}
-
-
-template<class Type>
-typename Foam::SolverPerformance<Type> Foam::max
-(
-    const typename Foam::SolverPerformance<Type>& sp1,
-    const typename Foam::SolverPerformance<Type>& sp2
-)
-{
-    return SolverPerformance<Type>
-    (
-        sp1.solverName(),
-        sp1.fieldName_,
-        max(sp1.initialResidual(), sp2.initialResidual()),
-        max(sp1.finalResidual(), sp2.finalResidual()),
-        max(sp1.nIterations(), sp2.nIterations()),
-        sp1.converged() && sp2.converged(),
-        sp1.singular() || sp2.singular()
-    );
-}
-
-
-template<class Type>
-Foam::Istream& Foam::operator>>
-(
-    Istream& is,
-    typename Foam::SolverPerformance<Type>& sp
-)
-{
-    is.readBeginList("SolverPerformance<Type>");
-    is  >> sp.solverName_
-        >> sp.fieldName_
-        >> sp.initialResidual_
-        >> sp.finalResidual_
-        >> sp.noIterations_
-        >> sp.converged_
-        >> sp.singular_;
-    is.readEndList("SolverPerformance<Type>");
-
-    return is;
-}
-
-
-template<class Type>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const typename Foam::SolverPerformance<Type>& sp
-)
-{
-    os  << token::BEGIN_LIST
-        << sp.solverName_ << token::SPACE
-        << sp.fieldName_ << token::SPACE
-        << sp.initialResidual_ << token::SPACE
-        << sp.finalResidual_ << token::SPACE
-        << sp.noIterations_ << token::SPACE
-        << sp.converged_ << token::SPACE
-        << sp.singular_ << token::SPACE
-        << token::END_LIST;
-
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.H b/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.H
deleted file mode 100644
index 7190834ac..000000000
--- a/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.H
+++ /dev/null
@@ -1,301 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     3.2
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::SolverPerformance
-
-Description
-    SolverPerformance is the class returned by the LduMatrix solver
-    containing performance statistics.
-
-SourceFiles
-    SolverPerformance.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef SolverPerformance_H
-#define SolverPerformance_H
-
-#include "word.H"
-#include "FixedList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of friend functions and operators
-
-template<class Type>
-class SolverPerformance;
-
-template<class Type>
-SolverPerformance<Type> max
-(
-    const SolverPerformance<Type>&,
-    const SolverPerformance<Type>&
-);
-
-template<class Type>
-Istream& operator>>
-(
-    Istream&,
-    SolverPerformance<Type>&
-);
-
-template<class Type>
-Ostream& operator<<
-(
-    Ostream&,
-    const SolverPerformance<Type>&
-);
-
-
-/*---------------------------------------------------------------------------*\
-                       Class SolverPerformance Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class SolverPerformance
-{
-    // Private data
-
-        word   solverName_;
-        word   fieldName_;
-        Type   initialResidual_;
-        Type   finalResidual_;
-        label  noIterations_;
-        bool   converged_;
-        FixedList<bool, pTraits<Type>::nComponents> singular_;
-
-
-public:
-
-    // Static data
-
-        // Declare name of the class and its debug switch
-        ClassName("SolverPerformance");
-
-        //- Large Type for the use in solvers
-        static const scalar great_;
-
-        //- Small Type for the use in solvers
-        static const scalar small_;
-
-        //- Very small Type for the use in solvers
-        static const scalar vsmall_;
-
-
-    // Constructors
-
-        SolverPerformance()
-        :
-            initialResidual_(pTraits<Type>::zero),
-            finalResidual_(pTraits<Type>::zero),
-            noIterations_(0),
-            converged_(false),
-            singular_(false)
-        {}
-
-
-        SolverPerformance
-        (
-            const word&  solverName,
-            const word&  fieldName,
-            const Type&  iRes = pTraits<Type>::zero,
-            const Type&  fRes = pTraits<Type>::zero,
-            const label  nIter = 0,
-            const bool   converged = false,
-            const bool   singular = false
-        )
-        :
-            solverName_(solverName),
-            fieldName_(fieldName),
-            initialResidual_(iRes),
-            finalResidual_(fRes),
-            noIterations_(nIter),
-            converged_(converged),
-            singular_(singular)
-        {}
-
-
-    // Member functions
-
-        //- Return solver name
-        const word& solverName() const
-        {
-            return solverName_;
-        }
-
-        //- Return solver name
-        word& solverName()
-        {
-            return solverName_;
-        }
-
-
-        //- Return field name
-        const word& fieldName() const
-        {
-            return fieldName_;
-        }
-
-
-        //- Return initial residual
-        const Type& initialResidual() const
-        {
-            return initialResidual_;
-        }
-
-        //- Return initial residual
-        Type& initialResidual()
-        {
-            return initialResidual_;
-        }
-
-
-        //- Return final residual
-        const Type& finalResidual() const
-        {
-            return finalResidual_;
-        }
-
-        //- Return final residual
-        Type& finalResidual()
-        {
-            return finalResidual_;
-        }
-
-
-        //- Return number of iterations
-        label nIterations() const
-        {
-            return noIterations_;
-        }
-
-        //- Return number of iterations
-        label& nIterations()
-        {
-            return noIterations_;
-        }
-
-
-        //- Has the solver converged?
-        bool converged() const
-        {
-            return converged_;
-        }
-
-        //- Is the matrix singular?
-        bool singular() const;
-
-        //- Check, store and return convergence
-        bool checkConvergence
-        (
-            const Type& tolerance,
-            const Type& relTolerance
-        );
-
-        //- Singularity test
-        bool checkSingularity(const Type& residual);
-
-        //- Print summary of solver performance to the given stream
-        void print(Ostream& os) const;
-
-        //- Replace component based on the minimal SolverPerformance
-        void replace
-        (
-            const label cmpt,
-            const SolverPerformance<typename pTraits<Type>::cmptType>& sp
-        );
-
-        //- Return the summary maximum of SolverPerformance<Type>
-        //  Effectively it will mostly return solverPerformanceScalar
-        SolverPerformance<typename pTraits<Type>::cmptType> max();
-
-
-    // Member Operators
-
-        bool operator!=(const SolverPerformance<Type>&) const;
-
-
-    // Friend functions
-
-        //- Return the element-wise maximum of two SolverPerformance<Type>s
-        friend SolverPerformance<Type> Foam::max <Type>
-        (
-            const SolverPerformance<Type>&,
-            const SolverPerformance<Type>&
-        );
-
-
-    // Ostream Operator
-
-        friend Istream& operator>> <Type>
-        (
-            Istream&,
-            SolverPerformance<Type>&
-        );
-
-        friend Ostream& operator<< <Type>
-        (
-            Ostream&,
-            const SolverPerformance<Type>&
-        );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#define makeSolverPerformance(Type)                                           \
-                                                                              \
-typedef Foam::SolverPerformance<Type>                                         \
-    solverPerformance##Type;                                                  \
-                                                                              \
-defineNamedTemplateTypeNameAndDebug(solverPerformance##Type, 0);              \
-                                                                              \
-template<>                                                                    \
-const scalar solverPerformance##Type::great_(1e20);                           \
-                                                                              \
-template<>                                                                    \
-const scalar solverPerformance##Type::small_(1e-20);                          \
-                                                                              \
-template<>                                                                    \
-const scalar solverPerformance##Type::vsmall_(VSMALL);                        \
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "SolverPerformance.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/foam/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/foam/matrices/lduMatrix/lduMatrix/lduMatrix.H
index e20fb81a7..cab85f082 100644
--- a/src/foam/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/foam/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -56,7 +56,6 @@ SourceFiles
 #include "primitiveFieldsFwd.H"
 #include "FieldField.H"
 #include "lduInterfaceFieldPtrsList.H"
-#include "SolverPerformance.H"
 #include "typeInfo.H"
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
@@ -172,6 +171,18 @@ public:
                 return solverName_;
             }
 
+            //- Return field name
+            const word& fieldName() const
+            {
+                return fieldName_;
+            }
+
+            //- Return access to field name
+            word& fieldName()
+            {
+                return fieldName_;
+            }
+
             //- Return initial residual
             scalar initialResidual() const
             {
@@ -235,6 +246,25 @@ public:
 
             //- Print summary of solver performance
             void print() const;
+
+        // Member Operators
+
+            bool operator!=(const solverPerformance&) const;
+
+        // Ostream Operator
+
+            friend Istream& operator>>
+            (
+                Istream&,
+                solverPerformance&
+            );
+
+            friend Ostream& operator<<
+            (
+                Ostream&,
+                const solverPerformance&
+            );
+
     };
 
 
diff --git a/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixTests.C b/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixTests.C
index e4121db6d..9fce146da 100644
--- a/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixTests.C
+++ b/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixTests.C
@@ -104,4 +104,62 @@ void Foam::lduMatrix::solverPerformance::print() const
 }
 
 
+bool Foam::lduSolverPerformance::operator!=
+(
+    const lduSolverPerformance& sp
+) const
+{
+    return
+    (
+        solverName()      != sp.solverName()
+     || fieldName()       != sp.fieldName()
+     || initialResidual() != sp.initialResidual()
+     || finalResidual()   != sp.finalResidual()
+     || nIterations()     != sp.nIterations()
+     || converged()       != sp.converged()
+     || singular()        != sp.singular()
+    );
+}
+
+
+Foam::Istream& Foam::operator>>
+(
+    Istream& is,
+    typename Foam::lduSolverPerformance& sp
+)
+{
+    is.readBeginList("SolverPerformance<Type>");
+    is  >> sp.solverName_
+        >> sp.fieldName_
+        >> sp.initialResidual_
+        >> sp.finalResidual_
+        >> sp.noIterations_
+        >> sp.converged_
+        >> sp.singular_;
+    is.readEndList("SolverPerformance<Type>");
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const typename Foam::lduSolverPerformance& sp
+)
+{
+    os  << token::BEGIN_LIST
+        << sp.solverName_ << token::SPACE
+        << sp.fieldName_ << token::SPACE
+        << sp.initialResidual_ << token::SPACE
+        << sp.finalResidual_ << token::SPACE
+        << sp.noIterations_ << token::SPACE
+        << sp.converged_ << token::SPACE
+        << sp.singular_ << token::SPACE
+        << token::END_LIST;
+
+    return os;
+}
+
+
 // ************************************************************************* //
diff --git a/src/foam/matrices/lduMatrix/lduMatrix/solverPerformance.C b/src/foam/matrices/lduMatrix/lduMatrix/solverPerformance.C
deleted file mode 100644
index 49e125d11..000000000
--- a/src/foam/matrices/lduMatrix/lduMatrix/solverPerformance.C
+++ /dev/null
@@ -1,47 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     3.2
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "solverPerformance.H"
-#include "fieldTypes.H"
-
-namespace Foam
-{
-    makeSolverPerformance(scalar);
-    makeSolverPerformance(vector);
-    makeSolverPerformance(sphericalTensor);
-    makeSolverPerformance(symmTensor);
-    makeSolverPerformance(tensor);
-};
-
-
-template<>
-Foam::SolverPerformance<Foam::scalar>
-Foam::SolverPerformance<Foam::scalar>::max()
-{
-    return *this;
-}
-
-
-// ************************************************************************* //
diff --git a/src/foam/matrices/lduMatrix/lduMatrix/solverPerformance.H b/src/foam/matrices/lduMatrix/lduMatrix/solverPerformance.H
deleted file mode 100644
index 3bb5256a1..000000000
--- a/src/foam/matrices/lduMatrix/lduMatrix/solverPerformance.H
+++ /dev/null
@@ -1,56 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     3.2
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-Typedef
-    Foam::solverPerformance
-
-Description
-    SolverPerformance instantiated for a scalar
-
-SourceFiles
-    solverPerformance.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef solverPerformance_H
-#define solverPerformance_H
-
-#include "SolverPerformance.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    typedef SolverPerformance<scalar> solverPerformance;
-
-    // Specialization of the max function for scalar object
-    template<>
-    SolverPerformance<scalar> SolverPerformance<scalar>::max();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/foam/matrices/solution/solution.C b/src/foam/matrices/solution/solution.C
index 758d3507c..5a91b6d2c 100644
--- a/src/foam/matrices/solution/solution.C
+++ b/src/foam/matrices/solution/solution.C
@@ -49,6 +49,82 @@ static const Foam::List<Foam::word> subDictNames
 //! @endcond localScope
 
 
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+void Foam::solution::read(const dictionary& dict)
+{
+    if (dict.found("cache"))
+    {
+        cache_ = dict.subDict("cache");
+        caching_ = cache_.lookupOrDefault("active", true);
+    }
+
+    if (dict.found("relaxationFactors"))
+    {
+        const dictionary& relaxDict(dict.subDict("relaxationFactors"));
+        if (relaxDict.found("fields") || relaxDict.found("equations"))
+        {
+            if (relaxDict.found("fields"))
+            {
+                fieldRelaxDict_ = relaxDict.subDict("fields");
+            }
+
+            if (relaxDict.found("equations"))
+            {
+                eqnRelaxDict_ = relaxDict.subDict("equations");
+            }
+        }
+        else
+        {
+            // backwards compatibility
+            fieldRelaxDict_.clear();
+
+            const wordList entryNames(relaxDict.toc());
+            forAll(entryNames, i)
+            {
+                const word& e = entryNames[i];
+                scalar value = readScalar(relaxDict.lookup(e));
+
+                if (e(0, 1) == "p")
+                {
+                    fieldRelaxDict_.add(e, value);
+                }
+                else if (e.length() >= 3)
+                {
+                    if (e(0, 3) == "rho")
+                    {
+                        fieldRelaxDict_.add(e, value);
+                    }
+                }
+
+            }
+
+            eqnRelaxDict_ = relaxDict;
+        }
+
+        fieldRelaxDefault_ =
+            fieldRelaxDict_.lookupOrDefault<scalar>("default", 0.0);
+
+        eqnRelaxDefault_ =
+            eqnRelaxDict_.lookupOrDefault<scalar>("default", 0.0);
+
+        if (debug)
+        {
+            Info<< "relaxation factors:" << nl
+                << "fields: " << fieldRelaxDict_ << nl
+                << "equations: " << eqnRelaxDict_ << endl;
+        }
+    }
+
+
+    if (dict.found("solvers"))
+    {
+        solvers_ = dict.subDict("solvers");
+        upgradeSolverDict(solvers_);
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::solution::solution(const objectRegistry& obr, const fileName& dictName)
@@ -66,12 +142,11 @@ Foam::solution::solution(const objectRegistry& obr, const fileName& dictName)
     ),
     cache_(dictionary::null),
     caching_(false),
-    relaxationFactors_
-    (
-        ITstream("relaxationFactors", tokenList())()
-    ),
-    defaultRelaxationFactor_(0),
-    solvers_(ITstream("solvers", tokenList())())
+    fieldRelaxDict_(dictionary::null),
+    eqnRelaxDict_(dictionary::null),
+    fieldRelaxDefault_(0),
+    eqnRelaxDefault_(0),
+    solvers_(dictionary::null)
 {
     if (!headerOk())
     {
@@ -86,7 +161,7 @@ Foam::solution::solution(const objectRegistry& obr, const fileName& dictName)
         }
     }
 
-    read();
+    read(solutionDict());
 }
 
 
@@ -170,43 +245,6 @@ Foam::label Foam::solution::upgradeSolverDict
 }
 
 
-bool Foam::solution::read()
-{
-    bool readOk = false;
-
-    if (headerOk())
-    {
-        readOk = regIOobject::read();
-    }
-
-    if (readOk)
-    {
-        if (found("cache"))
-        {
-            cache_ = subDict("cache");
-            caching_ = cache_.lookupOrDefault("active", true);
-        }
-
-        if (found("relaxationFactors"))
-        {
-            relaxationFactors_ = subDict("relaxationFactors");
-        }
-
-        relaxationFactors_.readIfPresent("default", defaultRelaxationFactor_);
-
-        if (found("solvers"))
-        {
-            solvers_ = subDict("solvers");
-            upgradeSolverDict(solvers_);
-        }
-
-        return true;
-    }
-
-    return readOk;
-}
-
-
 bool Foam::solution::cache(const word& name) const
 {
     if (caching_)
@@ -226,41 +264,52 @@ bool Foam::solution::cache(const word& name) const
 }
 
 
-bool Foam::solution::relax(const word& name) const
+bool Foam::solution::relaxField(const word& name) const
 {
     if (debug)
     {
-        Info<< "Find relax for " << name << endl;
+        Info<< "Field relaxation factor for " << name
+            << " is " << (fieldRelaxDict_.found(name) ? "set" : "unset")
+            << endl;
     }
 
-    return
-        relaxationFactors_.found(name)
-     || relaxationFactors_.found("default");
+    return fieldRelaxDict_.found(name) || fieldRelaxDict_.found("default");
 }
 
 
-Foam::scalar Foam::solution::relaxationFactor(const word& name) const
+bool Foam::solution::relaxEquation(const word& name) const
 {
     if (debug)
     {
-        Info<< "Lookup relaxationFactor for " << name << endl;
+        Info<< "Find equation relaxation factor for " << name << endl;
     }
 
-    if (relaxationFactors_.found(name))
+    return eqnRelaxDict_.found(name) || eqnRelaxDict_.found("default");
+}
+
+
+Foam::scalar Foam::solution::fieldRelaxationFactor(const word& name) const
+{
+    if (debug)
     {
-        return readScalar(relaxationFactors_.lookup(name));
+        Info<< "Lookup variable relaxation factor for " << name << endl;
     }
-    else if (defaultRelaxationFactor_ > SMALL)
+
+    if (fieldRelaxDict_.found(name))
     {
-        return defaultRelaxationFactor_;
+        return readScalar(fieldRelaxDict_.lookup(name));
+    }
+    else if (fieldRelaxDefault_ > SMALL)
+    {
+        return fieldRelaxDefault_;
     }
     else
     {
         FatalIOErrorIn
         (
-            "Foam::solution::relaxationFactor(const word&)",
-            relaxationFactors_
-        )   << "Cannot find relaxationFactor for '" << name
+            "Foam::solution::fieldRelaxationFactor(const word&)",
+            fieldRelaxDict_
+        )   << "Cannot find variable relaxation factor for '" << name
             << "' or a suitable default value."
             << exit(FatalIOError);
 
@@ -269,6 +318,49 @@ Foam::scalar Foam::solution::relaxationFactor(const word& name) const
 }
 
 
+Foam::scalar Foam::solution::equationRelaxationFactor(const word& name) const
+{
+    if (debug)
+    {
+        Info<< "Lookup equation relaxation factor for " << name << endl;
+    }
+
+    if (eqnRelaxDict_.found(name))
+    {
+        return readScalar(eqnRelaxDict_.lookup(name));
+    }
+    else if (eqnRelaxDefault_ > SMALL)
+    {
+        return eqnRelaxDefault_;
+    }
+    else
+    {
+        FatalIOErrorIn
+        (
+            "Foam::solution::eqnRelaxationFactor(const word&)",
+            eqnRelaxDict_
+        )   << "Cannot find equation relaxation factor for '" << name
+            << "' or a suitable default value."
+            << exit(FatalIOError);
+
+        return 0;
+    }
+}
+
+
+const Foam::dictionary& Foam::solution::solutionDict() const
+{
+    if (found("select"))
+    {
+        return subDict(word(lookup("select")));
+    }
+    else
+    {
+        return *this;
+    }
+}
+
+
 const Foam::dictionary& Foam::solution::solverDict(const word& name) const
 {
     if (debug)
@@ -293,15 +385,22 @@ const Foam::dictionary& Foam::solution::solver(const word& name) const
 }
 
 
+bool Foam::solution::read()
+{
+    if (regIOobject::read())
+    {
+        read(solutionDict());
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
 bool Foam::solution::writeData(Ostream& os) const
 {
-    // Write dictionaries
-    os << nl << "solvers";
-    solvers_.write(os, true);
-
-    os << nl << "relaxationFactors";
-    relaxationFactors_.write(os, true);
-
     // Write direct entries of the solution dictionary
     // HJ, 16/Feb/2010
     dictionary::write(os, false);
diff --git a/src/foam/matrices/solution/solution.H b/src/foam/matrices/solution/solution.H
index 00e8e1fb3..310e288e0 100644
--- a/src/foam/matrices/solution/solution.H
+++ b/src/foam/matrices/solution/solution.H
@@ -60,10 +60,16 @@ class solution
         bool caching_;
 
         //- Dictionary of relaxation factors for all the fields
-        dictionary relaxationFactors_;
+        dictionary fieldRelaxDict_;
+
+        //- Dictionary of relaxation factors for all the equations
+        dictionary eqnRelaxDict_;
 
         //- Optional default relaxation factor for all the fields
-        scalar defaultRelaxationFactor_;
+        scalar fieldRelaxDefault_;
+
+        //- Optional default relaxation factor for all the equations
+        scalar eqnRelaxDefault_;
 
         //- Dictionary of solver parameters for all the fields
         dictionary solvers_;
@@ -117,10 +123,20 @@ public:
             );
 
             //- Return true if the relaxation factor is given for the field
-            bool relax(const word& name) const;
+            bool relaxField(const word& name) const;
+
+            //- Return true if the relaxation factor is given for the equation
+            bool relaxEquation(const word& name) const;
 
             //- Return the relaxation factor for the given field
-            scalar relaxationFactor(const word& name) const;
+            scalar fieldRelaxationFactor(const word& name) const;
+
+            //- Return the relaxation factor for the given eqation
+            scalar equationRelaxationFactor(const word& name) const;
+
+            //- Return the selected sub-dictionary of solvers if the "select"
+            //  keyword is given, otherwise return the complete dictionary
+            const dictionary& solutionDict() const;
 
             //- Return the solver controls dictionary for the given field
             const dictionary& solverDict(const word& name) const;
@@ -131,10 +147,16 @@ public:
 
         // Edit
 
-            //- Return access to relaxation factors dictionary
-            dictionary& relaxationFactors()
+            //- Return access to field relaxation factors dictionary
+            dictionary& fieldRelaxationFactors()
             {
-                return relaxationFactors_;
+                return fieldRelaxDict_;
+            }
+
+            //- Return access to equation relaxation factors dictionary
+            dictionary& equationRelaxationFactors()
+            {
+                return eqnRelaxDict_;
             }
 
             //- Return access to solvers dictionary
diff --git a/src/foam/matrices/tolerances/tolerances.C b/src/foam/matrices/tolerances/tolerances.C
index 214659f4a..e5518f8a8 100644
--- a/src/foam/matrices/tolerances/tolerances.C
+++ b/src/foam/matrices/tolerances/tolerances.C
@@ -62,7 +62,7 @@ bool tolerances::read()
 {
     if (regIOobject::read())
     {
-        word toleranceSetName(lookup("toleranceSet"));
+        const word toleranceSetName(lookup("toleranceSet"));
         const dictionary& toleranceSet(subDict(toleranceSetName));
 
         if (toleranceSet.found("relaxationFactors"))
diff --git a/src/foam/meshes/data/data.C b/src/foam/meshes/data/data.C
index 97613d3d2..37365a516 100644
--- a/src/foam/meshes/data/data.C
+++ b/src/foam/meshes/data/data.C
@@ -59,4 +59,41 @@ const Foam::dictionary& Foam::data::solverPerformanceDict() const
 }
 
 
+void Foam::data::setSolverPerformance
+(
+    const word& name,
+    const lduSolverPerformance& sp
+) const
+{
+    dictionary& dict = const_cast<dictionary&>(solverPerformanceDict());
+
+    List<lduSolverPerformance> perfs;
+
+    if (prevTimeIndex_ != this->time().timeIndex())
+    {
+        // Reset solver performance between iterations
+        prevTimeIndex_ = this->time().timeIndex();
+        dict.clear();
+    }
+    else
+    {
+        dict.readIfPresent(name, perfs);
+    }
+
+    // Append to list
+    perfs.setSize(perfs.size()+1, sp);
+
+    dict.set(name, perfs);
+}
+
+
+void Foam::data::setSolverPerformance
+(
+    const lduSolverPerformance& sp
+) const
+{
+    setSolverPerformance(sp.fieldName(), sp);
+}
+
+
 // ************************************************************************* //
diff --git a/src/foam/meshes/data/data.H b/src/foam/meshes/data/data.H
index 1489935c5..a6cb98b99 100644
--- a/src/foam/meshes/data/data.H
+++ b/src/foam/meshes/data/data.H
@@ -39,7 +39,7 @@ SourceFiles
 #define data_H
 
 #include "IOdictionary.H"
-#include "solverPerformance.H"
+#include "lduMatrix.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -91,18 +91,16 @@ public:
             const dictionary& solverPerformanceDict() const;
 
             //- Add/set the solverPerformance entry for the named field
-            template<class Type>
             void setSolverPerformance
             (
                 const word& name,
-                const SolverPerformance<Type>&
+                const lduSolverPerformance&
             ) const;
 
             //- Add/set the solverPerformance entry, using its fieldName
-            template<class Type>
             void setSolverPerformance
             (
-                const SolverPerformance<Type>&
+                const lduSolverPerformance&
             ) const;
 };
 
@@ -113,12 +111,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-#   include "dataTemplates.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/foam/meshes/data/dataTemplates.C b/src/foam/meshes/data/dataTemplates.C
deleted file mode 100644
index 19da28227..000000000
--- a/src/foam/meshes/data/dataTemplates.C
+++ /dev/null
@@ -1,71 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | foam-extend: Open Source CFD
-   \\    /   O peration     | Version:     3.2
-    \\  /    A nd           | Web:         http://www.foam-extend.org
-     \\/     M anipulation  | For copyright notice see file Copyright
--------------------------------------------------------------------------------
-License
-    This file is part of foam-extend.
-
-    foam-extend is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation, either version 3 of the License, or (at your
-    option) any later version.
-
-    foam-extend is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "data.H"
-#include "foamTime.H"
-#include "solverPerformance.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::data::setSolverPerformance
-(
-    const word& name,
-    const SolverPerformance<Type>& sp
-) const
-{
-    dictionary& dict = const_cast<dictionary&>(solverPerformanceDict());
-
-    List<SolverPerformance<Type> > perfs;
-
-    if (prevTimeIndex_ != this->time().timeIndex())
-    {
-        // Reset solver performance between iterations
-        prevTimeIndex_ = this->time().timeIndex();
-        dict.clear();
-    }
-    else
-    {
-        dict.readIfPresent(name, perfs);
-    }
-
-    // Append to list
-    perfs.setSize(perfs.size()+1, sp);
-
-    dict.set(name, perfs);
-}
-
-
-template<class Type>
-void Foam::data::setSolverPerformance
-(
-    const SolverPerformance<Type>& sp
-) const
-{
-    setSolverPerformance(sp.fieldName(), sp);
-}
-
-
-// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.C b/src/postProcessing/functionObjects/systemCall/systemCall.C
index ddfdf9df5..79734812d 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.C
+++ b/src/postProcessing/functionObjects/systemCall/systemCall.C
@@ -81,7 +81,7 @@ void Foam::systemCall::execute()
 {
     forAll(executeCalls_, callI)
     {
-        ::system(executeCalls_[callI].c_str());
+        Foam::system(executeCalls_[callI]);
     }
 }
 
@@ -90,7 +90,7 @@ void Foam::systemCall::end()
 {
     forAll(endCalls_, callI)
     {
-        ::system(endCalls_[callI].c_str());
+        Foam::system(endCalls_[callI]);
     }
 }
 
@@ -99,7 +99,7 @@ void Foam::systemCall::write()
 {
     forAll(writeCalls_, callI)
     {
-        ::system(writeCalls_[callI].c_str());
+        Foam::system(writeCalls_[callI]);
     }
 }
 
diff --git a/src/tetFiniteElement/tetFemMatrix/tetFemMatrix.C b/src/tetFiniteElement/tetFemMatrix/tetFemMatrix.C
index ddac7e9c1..76429f44c 100644
--- a/src/tetFiniteElement/tetFemMatrix/tetFemMatrix.C
+++ b/src/tetFiniteElement/tetFemMatrix/tetFemMatrix.C
@@ -215,16 +215,18 @@ void tetFemMatrix<Type>::relax(const scalar alpha)
 template<class Type>
 void tetFemMatrix<Type>::relax()
 {
-    scalar alpha = 0;
-
     if (psi_.mesh().solutionDict().relax(psi_.name()))
     {
-        alpha = psi_.mesh().solutionDict().relaxationFactor(psi_.name());
+        relax(psi_.mesh().solutionDict().equationRelaxationFactor(psi_.name()));
     }
-
-    if (alpha > 0)
+    else
     {
-        relax(alpha);
+        if (debug)
+        {
+            InfoIn("void tetFemMatrix<Type>::relax()")
+                << "Relaxation factor for field " << psi_.name()
+                << " not found.  Relaxation will not be used." << endl;
+        }
     }
 }
 
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary
index ef4afc88a..40c2ce70b 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
index 128546641..07f21ed4c 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/boundary
index 02383fd43..c42c32d0c 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSchemes b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSchemes
index 1c752e1d2..427aa072d 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSchemes
@@ -57,10 +57,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
index d42b18461..2981c1b64 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
@@ -59,10 +59,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
index 8acf28ff2..97d7e575a 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
@@ -58,10 +58,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/0/T b/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/0/T
index a68c56a13..3bd0d273c 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/0/T
+++ b/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/0/T
@@ -27,16 +27,20 @@ boundaryField
     }
     outlet
     {
-        type inletOutlet;
-        inletValue $internalField;
+        type            inletOutlet;
+        inletValue      $internalField;
     }
     lowerWall
     {
-        type zeroGradient;
+        type            zeroGradient;
     }
     upperWall
     {
-        type zeroGradient;
+        type            zeroGradient;
+    }
+    frontAndBack
+    {
+        type            empty;
     }
 }
 
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/0/U b/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/0/U
index a02bcd0b3..4e7644bbe 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/0/U
+++ b/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/0/U
@@ -45,6 +45,10 @@ boundaryField
         type            fixedValue;
         value           uniform (0 0 0);
     }
+    frontAndBack
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/0/p b/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/0/p
index 9fb308d2b..2983e7faa 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/0/p
+++ b/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/0/p
@@ -35,7 +35,11 @@ boundaryField
     outlet
     {
         type            fixedValue;
-        value $internalField;
+        value           $internalField;
+    }
+    frontAndBack
+    {
+        type            empty;
     }
 }
 
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/system/fvSchemes
index 8acf28ff2..97d7e575a 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousSimpleFoam/beaverJoseph/system/fvSchemes
@@ -58,10 +58,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/0/T b/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/0/T
index a68c56a13..4f2711da2 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/0/T
+++ b/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/0/T
@@ -38,6 +38,10 @@ boundaryField
     {
         type zeroGradient;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/0/U b/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/0/U
index df82aea72..60530c711 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/0/U
+++ b/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/0/U
@@ -43,6 +43,10 @@ boundaryField
         type            fixedValue;
         value           uniform (0 0 0);
     }
+    defaultFaces
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/0/p b/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/0/p
index 9fb308d2b..e152e8bc0 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/0/p
+++ b/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/0/p
@@ -37,6 +37,10 @@ boundaryField
         type            fixedValue;
         value $internalField;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/system/fvSchemes
index 8acf28ff2..97d7e575a 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousSimpleFoam/porousPlug/system/fvSchemes
@@ -58,10 +58,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes
index bbbf51c95..181d65a72 100644
--- a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes
@@ -51,10 +51,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/T b/tutorials/compressible/rhoSonicFoam/shockTube/0/T
index 88a96c6a3..c73accee3 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/0/T
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/0/T
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
@@ -17,7 +17,7 @@ FoamFile
 
 dimensions      [0 0 0 1 0 0 0];
 
-internalField   nonuniform List<scalar>
+internalField   nonuniform List<scalar> 
 1000
 (
 348.432
@@ -1035,4 +1035,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/U b/tutorials/compressible/rhoSonicFoam/shockTube/0/U
index dfd6a3b28..0aef90a6e 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/0/U
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/0/U
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
@@ -31,4 +31,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/p b/tutorials/compressible/rhoSonicFoam/shockTube/0/p
index ccc492aa0..0b19ee1b3 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/0/p
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/0/p
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
@@ -17,7 +17,7 @@ FoamFile
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   nonuniform List<scalar>
+internalField   nonuniform List<scalar> 
 1000
 (
 100000
@@ -1035,4 +1035,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes
index bbbf51c95..181d65a72 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes
@@ -51,10 +51,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0/T b/tutorials/compressible/rhopSonicFoam/shockTube/0/T
index bdd6097ef..f3385c002 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/0/T
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/0/T
@@ -1,22 +1,127 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 0 0 1 0 0 0];
 
-internalField   uniform 1;
+internalField   nonuniform List<scalar> 
+100
+(
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+)
+;
 
 boundaryField
 {
@@ -24,11 +129,11 @@ boundaryField
     {
         type            zeroGradient;
     }
-
     empty
     {
         type            empty;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0/U b/tutorials/compressible/rhopSonicFoam/shockTube/0/U
index 12c79ed59..0aef90a6e 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/0/U
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/0/U
@@ -1,15 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
     class       volVectorField;
+    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -24,11 +25,11 @@ boundaryField
     {
         type            zeroGradient;
     }
-
     empty
     {
         type            empty;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/0/p b/tutorials/compressible/rhopSonicFoam/shockTube/0/p
index 96d0f410e..438517d73 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/0/p
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/0/p
@@ -1,22 +1,127 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   uniform 0;
+internalField   nonuniform List<scalar> 
+100
+(
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+)
+;
 
 boundaryField
 {
@@ -24,11 +129,11 @@ boundaryField
     {
         type            zeroGradient;
     }
-
     empty
     {
         type            empty;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary
index c81fa42aa..53a52f02b 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes
index c7dee39fb..902ca1719 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes
@@ -46,10 +46,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution
index 3bb92efb1..6a581ece1 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution
@@ -58,7 +58,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors 3;
     nCorrectors     1;
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary
index b7d6204fe..bec7824fb 100644
--- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes
index c92521cc5..902ca1719 100644
--- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes
@@ -46,10 +46,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         yes;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution
index f7cc03d3a..dc452d140 100644
--- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution
@@ -58,7 +58,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors 2;
     nCorrectors     2;
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary
index 43bfa8da3..635db6d90 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
 |    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
index 8115af8ab..d07e66a82 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
@@ -49,10 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
index fb6e74004..696bea81b 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
@@ -49,4 +49,12 @@ PIMPLE
     nNonOrthogonalCorrectors 0;
 }
 
+relaxationFactors
+{
+    U       1;
+    UFinal  1;
+    e       1;
+    eFinal  1;
+}
+
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
index a1402d29a..f5f356a7e 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
@@ -52,10 +52,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
index 400a06424..f0bcb2a0c 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
@@ -57,4 +57,12 @@ PIMPLE
     nNonOrthogonalCorrectors 0;
 }
 
+relaxationFactors
+{
+    U       1;
+    UFinal  1;
+    e       1;
+    eFinal  1;
+}
+
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
index a2be7031a..8e1412724 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
 |    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
index 901339f8d..0688f277c 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution
index 251e35535..b98c34c9e 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution
@@ -85,9 +85,11 @@ PIMPLE
 
 relaxationFactors
 {
-    U 0.8;
-    p 0.8;
-    e 0.8;
+    U       0.8;
+    UFinal  1;
+    p       0.8;
+    e       0.8;
+    eFinal  1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary
index f612fade1..b611ba5de 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
 |    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
index ee6ff84ee..015b13fcb 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution
index a4bfb4086..77927c51c 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution
@@ -76,4 +76,12 @@ PIMPLE
     nNonOrthogonalCorrectors 0;
 }
 
+relaxationFactors
+{
+    U       1;
+    UFinal  1;
+    e       1;
+    eFinal  1;
+}
+
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
index 0497c9070..05cd7e80e 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/steadyCompressibleFoam/2bump/system/fvSchemes b/tutorials/compressible/steadyCompressibleFoam/2bump/system/fvSchemes
index b385d9c20..c6cb52c2f 100644
--- a/tutorials/compressible/steadyCompressibleFoam/2bump/system/fvSchemes
+++ b/tutorials/compressible/steadyCompressibleFoam/2bump/system/fvSchemes
@@ -62,10 +62,4 @@ snGradSchemes
     default           corrected;
 }
 
-fluxRequired
-{
-    default           no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/polyMesh/boundary b/tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/polyMesh/boundary
index 6e11060e7..e40557440 100644
--- a/tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/polyMesh/boundary
+++ b/tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
 |    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/steadyCompressibleFoam/transonicBump/system/fvSchemes b/tutorials/compressible/steadyCompressibleFoam/transonicBump/system/fvSchemes
index 60377d916..57ce052d2 100644
--- a/tutorials/compressible/steadyCompressibleFoam/transonicBump/system/fvSchemes
+++ b/tutorials/compressible/steadyCompressibleFoam/transonicBump/system/fvSchemes
@@ -62,10 +62,4 @@ snGradSchemes
     default           corrected;
 }
 
-fluxRequired
-{
-    default           no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/constant/polyMesh/boundary b/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/constant/polyMesh/boundary
index 1efe963ea..bd4bb9360 100644
--- a/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/constant/polyMesh/boundary
+++ b/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
 |    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/system/fvSchemes b/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/system/fvSchemes
index 3cd84704a..23bcd5b7a 100644
--- a/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/system/fvSchemes
+++ b/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/system/fvSchemes
@@ -68,10 +68,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/constant/polyMesh/boundary b/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/constant/polyMesh/boundary
index 1efe963ea..bd4bb9360 100644
--- a/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/constant/polyMesh/boundary
+++ b/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
 |    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSchemes b/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSchemes
index ca121f1af..650522a7c 100644
--- a/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSchemes
+++ b/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSchemes
@@ -64,10 +64,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/constant/polyMesh/boundary b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/constant/polyMesh/boundary
index 081f3aa0d..0f18bdcde 100644
--- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/constant/polyMesh/boundary
+++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
 |    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSchemes b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSchemes
index 9a127dd08..e56e44f55 100644
--- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSchemes
+++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSchemes
@@ -65,10 +65,5 @@ snGradSchemes
     default           limited 0.5;
 }
 
-fluxRequired
-{
-    default           no;
-    p;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/constant/polyMesh/boundary b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/constant/polyMesh/boundary
index 081f3aa0d..0f18bdcde 100644
--- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/constant/polyMesh/boundary
+++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
 |    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSchemes b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSchemes
index 9a127dd08..e56e44f55 100644
--- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSchemes
+++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSchemes
@@ -65,10 +65,5 @@ snGradSchemes
     default           limited 0.5;
 }
 
-fluxRequired
-{
-    default           no;
-    p;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/constant/polyMesh/boundary b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/constant/polyMesh/boundary
index cf8b0f726..8c24ffa42 100644
--- a/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/constant/polyMesh/boundary
+++ b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
diff --git a/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/system/fvSchemes b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/system/fvSchemes
index 4f86f5b77..2834dfa86 100644
--- a/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/system/fvSchemes
+++ b/tutorials/coupled/blockCoupledScalarTransportFoam/blockCoupledSwirlTest/system/fvSchemes
@@ -48,9 +48,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/0/solid/materials b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/0/solid/materials
index 733fde5ba..019e71299 100644
--- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/0/solid/materials
+++ b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/0/solid/materials
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
 |    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/fvSchemes b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/fvSchemes
index f0af3a4f8..5c4ef7eda 100644
--- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/fvSchemes
+++ b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/fvSchemes
@@ -61,10 +61,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p_rgh;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/solid/fvSchemes b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/solid/fvSchemes
index 8ae0a8c2d..fa14cec57 100644
--- a/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/solid/fvSchemes
+++ b/tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/solid/fvSchemes
@@ -46,9 +46,4 @@ snGradSchemes
     default         uncorrected;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/0/solid/materials b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/0/solid/materials
index 733fde5ba..019e71299 100644
--- a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/0/solid/materials
+++ b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/0/solid/materials
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
 |    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/system/fvSchemes b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/system/fvSchemes
index 54695480a..8ba70fe6d 100644
--- a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/system/fvSchemes
+++ b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/system/fvSchemes
@@ -61,10 +61,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p_rgh;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/system/solid/fvSchemes b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/system/solid/fvSchemes
index 8ae0a8c2d..fa14cec57 100644
--- a/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/system/solid/fvSchemes
+++ b/tutorials/coupled/conjugateHeatSimpleFoam/conjugateCavity/system/solid/fvSchemes
@@ -46,9 +46,4 @@ snGradSchemes
     default         uncorrected;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes
index d10d41a22..5f2bce0ef 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes
@@ -45,9 +45,4 @@ snGradSchemes
     default         none;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes
index d10d41a22..5f2bce0ef 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes
@@ -45,9 +45,4 @@ snGradSchemes
     default         none;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes
index d10d41a22..5f2bce0ef 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes
@@ -45,9 +45,4 @@ snGradSchemes
     default         none;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes
index d10d41a22..5f2bce0ef 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes
@@ -45,9 +45,4 @@ snGradSchemes
     default         none;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes
index d10d41a22..5f2bce0ef 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes
@@ -45,9 +45,4 @@ snGradSchemes
     default         none;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes
index d10d41a22..5f2bce0ef 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes
@@ -45,9 +45,4 @@ snGradSchemes
     default         none;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes
index d10d41a22..5f2bce0ef 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes
@@ -45,9 +45,4 @@ snGradSchemes
     default         none;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes
index 50acfbe70..22bb996bc 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes
@@ -46,10 +46,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    phi;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary b/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary
index 769ac0f42..42bdf98f2 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes
index 03f2aba28..add92f8e6 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes
@@ -56,11 +56,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-    pB;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/equationReader/equationReaderDemo/pitzDaily/system/fvSchemes b/tutorials/equationReader/equationReaderDemo/pitzDaily/system/fvSchemes
index 5dcb3b012..e69bf7f04 100644
--- a/tutorials/equationReader/equationReaderDemo/pitzDaily/system/fvSchemes
+++ b/tutorials/equationReader/equationReaderDemo/pitzDaily/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss upwind;
-    div((nuEff*dev(T(grad(U))))) Gauss linear; // backwards compatibility
+    div((nuEff*dev(grad(U).T()))) Gauss linear; // backwards compatibility
     div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
@@ -61,10 +61,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSchemes b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSchemes
index 506b53b5c..5f2bce0ef 100644
--- a/tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSchemes
+++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSchemes
@@ -45,8 +45,4 @@ snGradSchemes
     default         none;
 }
 
-fluxRequired
-{
-}
-
 // ************************************************************************* //
diff --git a/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/system/fvSchemes b/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/system/fvSchemes
index 506b53b5c..5f2bce0ef 100644
--- a/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/system/fvSchemes
+++ b/tutorials/finiteArea/liquidFilmFoam/dropsSpreading/system/fvSchemes
@@ -45,8 +45,4 @@ snGradSchemes
     default         none;
 }
 
-fluxRequired
-{
-}
-
 // ************************************************************************* //
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/fvSchemes b/tutorials/finiteArea/surfactantFoam/planeTransport/system/fvSchemes
index 6e3cc7cdd..7401876a2 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/fvSchemes
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/fvSchemes
@@ -39,8 +39,4 @@ snGradSchemes
 {
 }
 
-fluxRequired
-{
-}
-
 // ************************************************************************* //
diff --git a/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereTransport/system/fvSchemes b/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereTransport/system/fvSchemes
index 6e3cc7cdd..7401876a2 100644
--- a/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereTransport/system/fvSchemes
+++ b/tutorials/finiteArea/surfactantFoam/sphereTransport/sphereTransport/system/fvSchemes
@@ -39,8 +39,4 @@ snGradSchemes
 {
 }
 
-fluxRequired
-{
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/constant/polyMesh/boundary b/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/constant/polyMesh/boundary
index 70a873217..8c1c27580 100644
--- a/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
@@ -44,7 +44,6 @@ FoamFile
     frontAndBack
     {
         type            empty;
-        physicalType    empty;
         nFaces          800;
         startFace       840;
     }
diff --git a/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/system/fvSchemes b/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/system/fvSchemes
index 46bdf14a2..96ec38f0e 100644
--- a/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/system/fvSchemes
+++ b/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/system/fvSchemes
@@ -52,10 +52,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/system/fvSolution b/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/system/fvSolution
index c91fea86e..e231e3689 100644
--- a/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/system/fvSolution
+++ b/tutorials/heatTransfer/boussinesqBuoyantFoam/heatedCavity/system/fvSolution
@@ -16,9 +16,29 @@ FoamFile
 
 solvers
 {
-    p               ICCG 1e-06 0;
-    U               BICCG 1e-05 0;
-    T               BICCG 1e-05 0;
+    p
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    T
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
 }
 
 PISO
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allclean
index 83fcec83e..93433055a 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allclean
@@ -4,4 +4,5 @@
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+rm -f constant/polyMesh/boundary
 cp 0/T.org 0/T
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSchemes
index 08c337a0c..3a9c09891 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSchemes
@@ -58,10 +58,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean
index 83fcec83e..93433055a 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean
@@ -4,4 +4,5 @@
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+rm -f constant/polyMesh/boundary
 cp 0/T.org 0/T
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
index 674e2d323..636e10839 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
@@ -58,10 +58,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary
index 2c17efa04..2d9d01dd7 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
@@ -15,43 +15,61 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-6
+9
 (
     maxY
     {
         type            empty;
-        nFaces          400;
-        startFace       22800;
+        nFaces          0;
+        startFace       59065;
     }
     minX
     {
         type            empty;
-        nFaces          400;
-        startFace       23200;
+        nFaces          0;
+        startFace       59065;
     }
     maxX
     {
         type            empty;
-        nFaces          400;
-        startFace       23600;
+        nFaces          0;
+        startFace       59065;
     }
     minY
     {
         type            empty;
-        nFaces          400;
-        startFace       24000;
+        nFaces          0;
+        startFace       59065;
     }
     ground
     {
         type            wall;
-        nFaces          400;
-        startFace       24400;
+        nFaces          590;
+        startFace       59065;
     }
     maxZ
     {
         type            empty;
-        nFaces          400;
-        startFace       24800;
+        nFaces          0;
+        startFace       59655;
+    }
+    igloo_region0
+    {
+        type            wall;
+        nFaces          2260;
+        startFace       59655;
+    }
+    twoFridgeFreezers_seal_0
+    {
+        type            wall;
+        nFaces          1344;
+        startFace       61915;
+    }
+    twoFridgeFreezers_herring_1
+    {
+        type            wall;
+        nFaces          1116;
+        startFace       63259;
     }
 )
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
index 674e2d323..636e10839 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
@@ -58,10 +58,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSchemes
index c9d03bf21..9832e1b35 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSchemes
@@ -59,10 +59,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon
index 8f61fdf4f..31bf6d6e0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
@@ -24,27 +24,31 @@ boundaryField
     floor
     {
         type            compressible::epsilonWallFunction;
+        refValue        uniform 0;
+        value           uniform 0.01;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        value           uniform 0.01;
     }
     ceiling
     {
         type            compressible::epsilonWallFunction;
+        refValue        uniform 0;
+        value           uniform 0.01;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        value           uniform 0.01;
     }
     fixedWalls
     {
         type            compressible::epsilonWallFunction;
+        refValue        uniform 0;
+        value           uniform 0.01;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        value           uniform 0.01;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k
index 22b76a2b4..bf5caa993 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
@@ -38,4 +38,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes
index 2f95d3b15..9f1a8cd96 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes
@@ -57,10 +57,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon
index d60a224ed..7a8fa872c 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
@@ -24,35 +24,40 @@ boundaryField
     box
     {
         type            compressible::epsilonWallFunction;
+        refValue        uniform 0;
+        value           uniform 0.01;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        value           uniform 0.01;
     }
     floor
     {
         type            compressible::epsilonWallFunction;
+        refValue        uniform 0;
+        value           uniform 0.01;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        value           uniform 0.01;
     }
     ceiling
     {
         type            compressible::epsilonWallFunction;
+        refValue        uniform 0;
+        value           uniform 0.01;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        value           uniform 0.01;
     }
     fixedWalls
     {
         type            compressible::epsilonWallFunction;
+        refValue        uniform 0;
+        value           uniform 0.01;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        value           uniform 0.01;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k
index 8c2bd1711..a52bacc9b 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
@@ -43,4 +43,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
index 70b61f822..5c7b4c2dc 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
@@ -58,10 +58,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes
index 7108dfbac..4560d748a 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes
@@ -60,10 +60,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/system/fvSchemes
index 7108dfbac..4560d748a 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/system/fvSchemes
@@ -60,10 +60,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
index 3a84f9cc6..cf84871b7 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
@@ -61,10 +61,4 @@ snGradSchemes
     default         limited 0.333;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes
index 37bd0dcc0..947c673e9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes
@@ -60,10 +60,4 @@ snGradSchemes
     default         limited 0.333;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
index c45fbbe2f..ced621f2d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
@@ -45,9 +45,4 @@ snGradSchemes
     default         limited 0.333;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary
index a5a1a2810..2c11571c2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
index d2f5b4a78..8819b4e9a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
@@ -60,10 +60,4 @@ snGradSchemes
     default         limited 0.333;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
index c4d92e41f..0e3d160c6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
@@ -38,8 +38,4 @@ snGradSchemes
 {
 }
 
-fluxRequired
-{
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
index c45fbbe2f..ced621f2d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
@@ -45,9 +45,4 @@ snGradSchemes
     default         limited 0.333;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
index c45fbbe2f..ced621f2d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
@@ -45,9 +45,4 @@ snGradSchemes
     default         limited 0.333;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
index c45fbbe2f..ced621f2d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
@@ -45,9 +45,4 @@ snGradSchemes
     default         limited 0.333;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
index d2f5b4a78..8819b4e9a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
@@ -60,10 +60,4 @@ snGradSchemes
     default         limited 0.333;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSchemes
index c4d92e41f..0e3d160c6 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSchemes
@@ -38,8 +38,4 @@ snGradSchemes
 {
 }
 
-fluxRequired
-{
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes
index 57b67d2f5..de7b6e7c8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes
@@ -45,9 +45,4 @@ snGradSchemes
     default         limited 0.333;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
index ca48fbc05..c4b9fd122 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
@@ -58,10 +58,4 @@ snGradSchemes
     default         limited 0.333;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/pitzDailyBodyFitted/system/fvSolution b/tutorials/immersedBoundary/pitzDailyBodyFitted/system/fvSolution
index 44e6ccee5..60b04d2a3 100644
--- a/tutorials/immersedBoundary/pitzDailyBodyFitted/system/fvSolution
+++ b/tutorials/immersedBoundary/pitzDailyBodyFitted/system/fvSolution
@@ -50,7 +50,12 @@ SIMPLE
 {
     nNonOrthogonalCorrectors 0;
 
-    convergence          1e-4;
+    residualControl
+    {
+        p               1e-4;
+        U               1e-4;
+        "(k|epsilon)"   1e-4;
+    }
 }
 
 relaxationFactors
diff --git a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepLaminar/constant/polyMesh/boundary b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepLaminar/constant/polyMesh/boundary
index 8e9b6ebe9..6bd5b4bb5 100644
--- a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepLaminar/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepLaminar/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
 |    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepLaminar/system/fvSchemes b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepLaminar/system/fvSchemes
index d51ec252b..548032a33 100644
--- a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepLaminar/system/fvSchemes
+++ b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepLaminar/system/fvSchemes
@@ -52,10 +52,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/constant/polyMesh/boundary b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/constant/polyMesh/boundary
index 8e9b6ebe9..6bd5b4bb5 100644
--- a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
 |    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/fvSchemes b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/fvSchemes
index 828af10e1..33b9850c0 100644
--- a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/fvSchemes
+++ b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/fvSchemes
@@ -50,10 +50,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pUCoupledFoam/cavity/constant/polyMesh/boundary b/tutorials/incompressible/pUCoupledFoam/cavity/constant/polyMesh/boundary
index bd1d0b7f1..9e2922b27 100644
--- a/tutorials/incompressible/pUCoupledFoam/cavity/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pUCoupledFoam/cavity/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
 |    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pUCoupledFoam/cavity/system/fvSchemes b/tutorials/incompressible/pUCoupledFoam/cavity/system/fvSchemes
index 0f04213a3..f5781d0bb 100644
--- a/tutorials/incompressible/pUCoupledFoam/cavity/system/fvSchemes
+++ b/tutorials/incompressible/pUCoupledFoam/cavity/system/fvSchemes
@@ -48,10 +48,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/fvSolution b/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/fvSolution
index ccc5f6da6..e0ea102fc 100644
--- a/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/fvSolution
@@ -66,7 +66,13 @@ SIMPLE
     nNonOrthogonalCorrectors 1;
     pRefCell 0;
     pRefValue 0;
-    convergence 1e-5;
+
+    residualControl
+    {
+        p               1e-5;
+        U               1e-5;
+        "(k|epsilon)"   1e-5;
+    }
 }
 
 relaxationFactors
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index c16b483e1..5526c2144 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -22,7 +22,7 @@ startTime       0;
 
 stopAt          endTime;
 
-endTime         1000;
+endTime         2000;
 
 deltaT          1;
 
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
index b125baf11..4a7b2732e 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
@@ -64,17 +64,29 @@ SIMPLE
 {
     nNonOrthogonalCorrectors 0;
 
-    convergence          1e-4;
+    residualControl
+    {
+        p               1e-4;
+        U               1e-4;
+        "(k|epsilon)"   1e-4;
+    }
 }
 
 relaxationFactors
 {
-    p               0.3;
-    U               0.7;
-    k               0.7;
-    epsilon         0.7;
-    R               0.7;
-    nuTilda         0.7;
+    fields
+    {
+        p               0.3;
+    }
+
+    equations
+    {
+        U               0.7;
+        k               0.7;
+        epsilon         0.7;
+        R               0.7;
+        nuTilda         0.7;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary
index dff7e8226..eedf0fdb7 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
index 5d0500037..d98d660a2 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
@@ -62,10 +62,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
index e48e0f6b4..d459df935 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
@@ -50,7 +50,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     transonic       yes;
     nCorrectors     2;
diff --git a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/boundary b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/boundary
index 0beee5a65..8e0826950 100644
--- a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/boundary
+++ b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
@@ -38,7 +38,6 @@ FoamFile
     frontAndBack
     {
         type            empty;
-        physicalType    empty;
         nFaces          2000;
         startFace       2110;
     }
diff --git a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/fvSchemes b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/fvSchemes
index 277df7d18..e807e470c 100644
--- a/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/fvSchemes
+++ b/tutorials/lagrangian/icoLagrangianFoam/channelParticles/system/fvSchemes
@@ -49,10 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/createFields.H b/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/createFields.H
index 794eb514b..54c52cb09 100644
--- a/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/createFields.H
+++ b/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/createFields.H
@@ -53,6 +53,8 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
+
     dimensionedScalar rhoVal
     (
         transportProperties.lookup("rho")
diff --git a/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/icoLagrangianFoam.C b/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/icoLagrangianFoam.C
index 34efa82f2..36f4462a0 100644
--- a/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/icoLagrangianFoam.C
+++ b/tutorials/lagrangian/icoLagrangianFoam/icoLagrangianFoam/icoLagrangianFoam.C
@@ -31,6 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
+#include "pisoControl.H"
 
 #include "basicKinematicCloud.H"
 
@@ -42,6 +43,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 
@@ -53,7 +57,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPISOControls.H"
 #       include "CourantNo.H"
 
         Info<< "Evolving kinematicCloud" << endl;
@@ -73,7 +76,7 @@ int main(int argc, char *argv[])
 
         // --- PISO loop
 
-        for (int corr=0; corr<nCorr; corr++)
+        while (piso.correct())
         {
             volScalarField rUA = 1.0/UEqn.A();
 
@@ -83,7 +86,7 @@ int main(int argc, char *argv[])
 
             adjustPhi(phi, U, p);
 
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            while (piso.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
@@ -93,7 +96,7 @@ int main(int argc, char *argv[])
                 pEqn.setReference(pRefCell, pRefValue);
                 pEqn.solve();
 
-                if (nonOrth == nNonOrthCorr)
+                if (piso.finalNonOrthogonalIter())
                 {
                     phi -= pEqn.flux();
                 }
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
index cb015f101..80fcf5310 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
@@ -6,7 +6,7 @@
 cleanCase
 
 # remove 0 directory
-rm -rf 0
+rm -rf 0 postProcessing
 
 # copy 0.org to 0
 cp -r 0.org 0
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/boundary b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/boundary
index 9be6801c5..211bb44ae 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/boundary
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
@@ -21,39 +21,39 @@ FoamFile
     {
         type            wall;
         nFaces          172;
-        startFace       3334;
+        startFace       3314;
     }
     inlet
     {
         type            patch;
         nFaces          20;
-        startFace       3506;
+        startFace       3486;
     }
     outlet
     {
         type            patch;
         nFaces          20;
-        startFace       3526;
+        startFace       3506;
     }
     cycLeft
     {
         type            cyclic;
-        nFaces          0;
-        startFace       3546;
+        nFaces          40;
+        startFace       3526;
         featureCos      0.9;
     }
     cycRight
     {
         type            cyclic;
         nFaces          0;
-        startFace       3546;
+        startFace       3566;
         featureCos      0.9;
     }
     frontAndBack
     {
         type            empty;
         nFaces          3440;
-        startFace       3546;
+        startFace       3566;
     }
 )
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSchemes b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSchemes
index 5d0500037..d98d660a2 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSchemes
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSchemes
@@ -62,10 +62,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/G b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/G
index c5b215263..0ef856417 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/G
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/G
@@ -47,6 +47,10 @@ boundaryField
         emissivity      1;
         value           uniform 0;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/H2O
index c9b2b3a93..8b893a122 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/H2O
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/H2O
@@ -44,6 +44,10 @@ boundaryField
         type            fixedValue;
         value           uniform 0.01;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/T b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/T
index b2aab8347..5e1a51629 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/T
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/T
@@ -43,6 +43,10 @@ boundaryField
         type            fixedValue;
         value           uniform 473.0;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/U b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/U
index 84938a483..8aa7ead8e 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/U
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/U
@@ -43,6 +43,10 @@ boundaryField
         type            fixedValue;
         value           uniform (0 1e-8 0);
     }
+    defaultFaces
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/air b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/air
index 5b0d480d9..9fa907810 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/air
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/air
@@ -44,6 +44,10 @@ boundaryField
         type            fixedValue;
         value           uniform 0.99;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/p b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/p
index cae73b9ca..155b08669 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/p
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/0/p
@@ -42,6 +42,10 @@ boundaryField
     {
         type            zeroGradient;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/boundary b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/boundary
index d960c9845..299824a75 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/boundary
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSchemes b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSchemes
index 5bc3f2f84..233870cb1 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSchemes
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSchemes
@@ -56,10 +56,4 @@ snGradSchemes
     default         uncorrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSchemes
index e736452d8..a4b2cfc04 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSchemes
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSchemes
@@ -57,10 +57,4 @@ snGradSchemes
     default         uncorrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/boundary
index 8451880b5..9803a53e2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/boundary
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes
index cc26190a2..d98d660a2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes
@@ -62,10 +62,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
index 11c0ed404..fbc3a5ee3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
@@ -96,7 +96,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     transonic       no;
     nCorrectors     2;
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H
index 46bbe2d91..39a93262b 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H
@@ -57,3 +57,5 @@
     Info<< "Creating field DpDt\n" << endl;
     volScalarField DpDt =
         fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary
index dff7e8226..eedf0fdb7 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
+|  \\    /   O peration     | Version:     4.0                                |
 |   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
+|    \\/     M anipulation  | For copyright notice see file Copyright         |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSchemes b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSchemes
index 5d0500037..d98d660a2 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSchemes
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSchemes
@@ -62,10 +62,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/cfMesh/cartesian2DMesh/hatOctree/system/fvSchemes b/tutorials/mesh/cfMesh/cartesian2DMesh/hatOctree/system/fvSchemes
index 4d25d6f56..6c86e8a53 100644
--- a/tutorials/mesh/cfMesh/cartesian2DMesh/hatOctree/system/fvSchemes
+++ b/tutorials/mesh/cfMesh/cartesian2DMesh/hatOctree/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/cfMesh/cartesianMesh/asmoOctree/system/fvSchemes b/tutorials/mesh/cfMesh/cartesianMesh/asmoOctree/system/fvSchemes
index 4d25d6f56..6c86e8a53 100644
--- a/tutorials/mesh/cfMesh/cartesianMesh/asmoOctree/system/fvSchemes
+++ b/tutorials/mesh/cfMesh/cartesianMesh/asmoOctree/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/cfMesh/cartesianMesh/bunnyOctree/system/fvSchemes b/tutorials/mesh/cfMesh/cartesianMesh/bunnyOctree/system/fvSchemes
index 4d25d6f56..6c86e8a53 100644
--- a/tutorials/mesh/cfMesh/cartesianMesh/bunnyOctree/system/fvSchemes
+++ b/tutorials/mesh/cfMesh/cartesianMesh/bunnyOctree/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/system/fvSchemes b/tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/system/fvSchemes
index 4d25d6f56..6c86e8a53 100644
--- a/tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/system/fvSchemes
+++ b/tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/cfMesh/cartesianMesh/intakePortOctree/system/fvSchemes b/tutorials/mesh/cfMesh/cartesianMesh/intakePortOctree/system/fvSchemes
index 4d25d6f56..6c86e8a53 100644
--- a/tutorials/mesh/cfMesh/cartesianMesh/intakePortOctree/system/fvSchemes
+++ b/tutorials/mesh/cfMesh/cartesianMesh/intakePortOctree/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/system/fvSchemes b/tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/system/fvSchemes
index 4d25d6f56..6c86e8a53 100644
--- a/tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/system/fvSchemes
+++ b/tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/cfMesh/cartesianMesh/sBendOctree/system/fvSchemes b/tutorials/mesh/cfMesh/cartesianMesh/sBendOctree/system/fvSchemes
index 4d25d6f56..6c86e8a53 100644
--- a/tutorials/mesh/cfMesh/cartesianMesh/sBendOctree/system/fvSchemes
+++ b/tutorials/mesh/cfMesh/cartesianMesh/sBendOctree/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/cfMesh/cartesianMesh/sawOctree/system/fvSchemes b/tutorials/mesh/cfMesh/cartesianMesh/sawOctree/system/fvSchemes
index 4d25d6f56..6c86e8a53 100644
--- a/tutorials/mesh/cfMesh/cartesianMesh/sawOctree/system/fvSchemes
+++ b/tutorials/mesh/cfMesh/cartesianMesh/sawOctree/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/system/fvSchemes b/tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/system/fvSchemes
index d50ac1bc2..3ea4e7c47 100644
--- a/tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/system/fvSchemes
+++ b/tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/system/fvSchemes
@@ -28,12 +28,6 @@ divSchemes
     div(phi,U)  Gauss limitedLinearV 1;
 }
 
-fluxRequired
-{
-    default no;
-    p   p;
-}
-
 gradSchemes
 {
     default Gauss linear;
@@ -63,4 +57,4 @@ snGradSchemes
     sngrad(p)   corrected;
 }
 
-// ************************************************************************* //
\ No newline at end of file
+// ************************************************************************* //
diff --git a/tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/system/fvSchemes b/tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/system/fvSchemes
index 4d25d6f56..6c86e8a53 100644
--- a/tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/system/fvSchemes
+++ b/tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/cfMesh/pMesh/bunnyPoly/system/fvSchemes b/tutorials/mesh/cfMesh/pMesh/bunnyPoly/system/fvSchemes
index 4d25d6f56..6c86e8a53 100644
--- a/tutorials/mesh/cfMesh/pMesh/bunnyPoly/system/fvSchemes
+++ b/tutorials/mesh/cfMesh/pMesh/bunnyPoly/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/cfMesh/pMesh/multipleOrifices/system/fvSchemes b/tutorials/mesh/cfMesh/pMesh/multipleOrifices/system/fvSchemes
index 4d25d6f56..6c86e8a53 100644
--- a/tutorials/mesh/cfMesh/pMesh/multipleOrifices/system/fvSchemes
+++ b/tutorials/mesh/cfMesh/pMesh/multipleOrifices/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/cfMesh/tetMesh/cutCubeOctree/system/fvSchemes b/tutorials/mesh/cfMesh/tetMesh/cutCubeOctree/system/fvSchemes
index 4d25d6f56..6c86e8a53 100644
--- a/tutorials/mesh/cfMesh/tetMesh/cutCubeOctree/system/fvSchemes
+++ b/tutorials/mesh/cfMesh/tetMesh/cutCubeOctree/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/cfMesh/tetMesh/socketOctree/system/fvSchemes b/tutorials/mesh/cfMesh/tetMesh/socketOctree/system/fvSchemes
index 4d25d6f56..6c86e8a53 100644
--- a/tutorials/mesh/cfMesh/tetMesh/socketOctree/system/fvSchemes
+++ b/tutorials/mesh/cfMesh/tetMesh/socketOctree/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/moveDynamicMesh/circCylinder3d/system/fvSchemes b/tutorials/mesh/moveDynamicMesh/circCylinder3d/system/fvSchemes
index bfdea8b0b..1f11f8c19 100644
--- a/tutorials/mesh/moveDynamicMesh/circCylinder3d/system/fvSchemes
+++ b/tutorials/mesh/moveDynamicMesh/circCylinder3d/system/fvSchemes
@@ -44,9 +44,4 @@ snGradSchemes
     default         none;
 }
 
-fluxRequired
-{
-    default         none;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/moveDynamicMesh/circCylinder3dHex/system/fvSchemes b/tutorials/mesh/moveDynamicMesh/circCylinder3dHex/system/fvSchemes
index af71c96c3..d1f9d4939 100644
--- a/tutorials/mesh/moveDynamicMesh/circCylinder3dHex/system/fvSchemes
+++ b/tutorials/mesh/moveDynamicMesh/circCylinder3dHex/system/fvSchemes
@@ -51,11 +51,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pcorr;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/moveDynamicMesh/movingCylinders/system/fvSchemes b/tutorials/mesh/moveDynamicMesh/movingCylinders/system/fvSchemes
index 6fe96e810..2f650e237 100644
--- a/tutorials/mesh/moveDynamicMesh/movingCylinders/system/fvSchemes
+++ b/tutorials/mesh/moveDynamicMesh/movingCylinders/system/fvSchemes
@@ -32,7 +32,4 @@ interpolationSchemes
 snGradSchemes
 {}
 
-fluxRequired
-{}
-
 // ************************************************************************* //
diff --git a/tutorials/multiSolver/multiSolverDemo/parTeeFitting2d/system/fvSchemes b/tutorials/multiSolver/multiSolverDemo/parTeeFitting2d/system/fvSchemes
index bb9073fa0..f5a68b410 100644
--- a/tutorials/multiSolver/multiSolverDemo/parTeeFitting2d/system/fvSchemes
+++ b/tutorials/multiSolver/multiSolverDemo/parTeeFitting2d/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiSolver/multiSolverDemo/parTeeFitting2d/system/multiFvSchemes b/tutorials/multiSolver/multiSolverDemo/parTeeFitting2d/system/multiFvSchemes
index 23c909a7d..77740ea9f 100644
--- a/tutorials/multiSolver/multiSolverDemo/parTeeFitting2d/system/multiFvSchemes
+++ b/tutorials/multiSolver/multiSolverDemo/parTeeFitting2d/system/multiFvSchemes
@@ -53,12 +53,6 @@ multiSolver
         {
             default         corrected;
         }
-
-        fluxRequired
-        {
-            default         no;
-            p;
-        }
     }
 
     icoFoam2
@@ -97,12 +91,6 @@ multiSolver
         {
             default         corrected;
         }
-
-        fluxRequired
-        {
-            default         no;
-            p;
-        }
     }
 
     scalarTransportFoam
@@ -139,11 +127,6 @@ multiSolver
         {
             default         corrected;
         }
-
-        fluxRequired
-        {
-            default         no;
-        }
    }
 }
 
diff --git a/tutorials/multiSolver/multiSolverDemo/teeFitting2d/system/controlDict b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/system/controlDict
index fd8d00078..516f43a57 100644
--- a/tutorials/multiSolver/multiSolverDemo/teeFitting2d/system/controlDict
+++ b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/system/controlDict
@@ -1,38 +1,38 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | foam-extend: Open Source CFD                    |
-|  \\    /   O peration     | Version:     3.2                                |
-|   \\  /    A nd           | Web:         http://www.foam-extend.org         |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-application     multiSolverDemo;
-
-deltaT          0.01;
-
-writeControl    timeStep;
-
-writeInterval   1;
-
-startFrom       startTime;
-
-startTime       0;
-
-stopAt          noWriteNow;
-
-endTime         0.1;
-
-timeFormat      scientific;
-
-timePrecision   6;
-
-// ************************************************************************* //
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | foam-extend: Open Source CFD                    |
+|  \\    /   O peration     | Version:     3.2                                |
+|   \\  /    A nd           | Web:         http://www.foam-extend.org         |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     multiSolverDemo;
+
+deltaT          0.01;
+
+writeControl    timeStep;
+
+writeInterval   1;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          noWriteNow;
+
+endTime         0.1;
+
+timeFormat      scientific;
+
+timePrecision   6;
+
+// ************************************************************************* //
diff --git a/tutorials/multiSolver/multiSolverDemo/teeFitting2d/system/fvSchemes b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/system/fvSchemes
index bb9073fa0..f5a68b410 100644
--- a/tutorials/multiSolver/multiSolverDemo/teeFitting2d/system/fvSchemes
+++ b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiSolver/multiSolverDemo/teeFitting2d/system/multiFvSchemes b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/system/multiFvSchemes
index 23c909a7d..77740ea9f 100644
--- a/tutorials/multiSolver/multiSolverDemo/teeFitting2d/system/multiFvSchemes
+++ b/tutorials/multiSolver/multiSolverDemo/teeFitting2d/system/multiFvSchemes
@@ -53,12 +53,6 @@ multiSolver
         {
             default         corrected;
         }
-
-        fluxRequired
-        {
-            default         no;
-            p;
-        }
     }
 
     icoFoam2
@@ -97,12 +91,6 @@ multiSolver
         {
             default         corrected;
         }
-
-        fluxRequired
-        {
-            default         no;
-            p;
-        }
     }
 
     scalarTransportFoam
@@ -139,11 +127,6 @@ multiSolver
         {
             default         corrected;
         }
-
-        fluxRequired
-        {
-            default         no;
-        }
    }
 }
 
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes
index d9adcf08b..c18f75717 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSchemes
@@ -49,12 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pd              ;
-    pcorr           ;
-    alpha1          ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/barotropicCavitatingFoam/nozzle/system/fvSchemes b/tutorials/multiphase/barotropicCavitatingFoam/nozzle/system/fvSchemes
index 90cfcc65b..9b35c667c 100644
--- a/tutorials/multiphase/barotropicCavitatingFoam/nozzle/system/fvSchemes
+++ b/tutorials/multiphase/barotropicCavitatingFoam/nozzle/system/fvSchemes
@@ -50,9 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
index 6853a18c5..b8076048c 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
index a3400ebe4..354fef623 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
@@ -55,11 +55,4 @@ snGradSchemes
     snGrad(p)       corrected;
 }
 
-fluxRequired
-{
-    default         none;
-    p               ;
-    rho             ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
index b658855fd..6a8867d40 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
@@ -78,14 +78,10 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nCorrectors     3;
     nNonOrthogonalCorrectors 0;
 }
 
-SIMPLE
-{
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
index a3400ebe4..354fef623 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
@@ -55,11 +55,4 @@ snGradSchemes
     snGrad(p)       corrected;
 }
 
-fluxRequired
-{
-    default         none;
-    p               ;
-    rho             ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
index b658855fd..6a8867d40 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
@@ -78,14 +78,10 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nCorrectors     3;
     nNonOrthogonalCorrectors 0;
 }
 
-SIMPLE
-{
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
index c08d06e6d..3aa8439aa 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
@@ -58,11 +58,4 @@ snGradSchemes
     snGrad(p)       corrected;
 }
 
-fluxRequired
-{
-    default        none;
-    p;
-    rho;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
index 3fd077965..7255e4071 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
@@ -83,7 +83,7 @@ solvers
     };
 }
 
-PISO
+PIMPLE
 {
     nCorrectors                2;
     nNonOrthogonalCorrectors   1;
@@ -91,7 +91,4 @@ PISO
 //    removeSwirl                2;
 }
 
-SIMPLE
-{}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes
index bb7f1f843..6bcfd6e66 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes
@@ -53,12 +53,4 @@ snGradSchemes
     default         uncorrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-    pcorr;
-    gamma;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution
index fa531f6fc..34691d29e 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution
@@ -123,6 +123,11 @@ solvers
 }
 
 PISO
+{
+    cAlpha          4;
+}
+
+PIMPLE
 {
     momentumPredictor no;
     transSonic      no;
@@ -131,7 +136,6 @@ PISO
     nNonOrthogonalCorrectors 0;
     nAlphaCorr      1;
     nAlphaSubCycles 1;
-    cAlpha          4;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes
index bb7f1f843..6bcfd6e66 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes
@@ -53,12 +53,4 @@ snGradSchemes
     default         uncorrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-    pcorr;
-    gamma;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution
index fa531f6fc..34691d29e 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution
@@ -123,6 +123,11 @@ solvers
 }
 
 PISO
+{
+    cAlpha          4;
+}
+
+PIMPLE
 {
     momentumPredictor no;
     transSonic      no;
@@ -131,7 +136,6 @@ PISO
     nNonOrthogonalCorrectors 0;
     nAlphaCorr      1;
     nAlphaSubCycles 1;
-    cAlpha          4;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes
index 987542c84..835581169 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes
@@ -49,12 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pd;
-    pcorr;
-    alpha;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setSubset/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setSubset/fvSchemes
index b1d22b806..835581169 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setSubset/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/setSubset/fvSchemes
@@ -49,12 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-    pcorr           ;
-    alpha           ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes
index af3d40159..7ba417adb 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes
@@ -49,12 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pd;
-    pcorr;
-    alpha;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setSubset/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setSubset/fvSchemes
index 149abf955..7ba417adb 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setSubset/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/setSubset/fvSchemes
@@ -49,12 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pd              ;
-    pcorr           ;
-    alpha           ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes
index a3410c0fb..549c46c80 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes
@@ -49,12 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pd;
-    pcorr;
-    alpha;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes
index 23ec9e634..af6413dbe 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes
@@ -49,12 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pd;
-    pcorr;
-    alpha;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes
index 23ec9e634..af6413dbe 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes
@@ -49,12 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pd;
-    pcorr;
-    alpha;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes
index 23ec9e634..af6413dbe 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes
@@ -49,12 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pd;
-    pcorr;
-    alpha;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes
index 23ec9e634..af6413dbe 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes
@@ -49,12 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pd;
-    pcorr;
-    alpha;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
index ac5324e27..3e87eeff0 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
@@ -49,12 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pd;
-    pcorr;
-    alpha1;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
index fbff4872f..b0782e041 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
@@ -53,12 +53,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pd;
-    pcorr;
-    alpha1;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
index 688900731..b59b4bd9d 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
@@ -54,12 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pd;
-    pcorr;
-    alpha1;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
index 92fb111fa..ad88255ef 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes
@@ -47,12 +47,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pd;
-    pcorr;
-    "alpha.";
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
index f3414e879..661b1416b 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
@@ -59,7 +59,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     momentumPredictor no;
     nCorrectors     3;
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
index 110f08fd8..f19f38c7d 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
@@ -98,7 +98,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nCorrectors     4;
     nNonOrthogonalCorrectors 0;
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
index 110f08fd8..f19f38c7d 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
@@ -98,7 +98,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nCorrectors     4;
     nNonOrthogonalCorrectors 0;
diff --git a/tutorials/multiphase/settlingFoam/dahl/system/fvSchemes b/tutorials/multiphase/settlingFoam/dahl/system/fvSchemes
index bd9ad5764..481f33b8b 100644
--- a/tutorials/multiphase/settlingFoam/dahl/system/fvSchemes
+++ b/tutorials/multiphase/settlingFoam/dahl/system/fvSchemes
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/dahl/system/fvSolution b/tutorials/multiphase/settlingFoam/dahl/system/fvSolution
index 9fef9915b..43c6204f4 100644
--- a/tutorials/multiphase/settlingFoam/dahl/system/fvSolution
+++ b/tutorials/multiphase/settlingFoam/dahl/system/fvSolution
@@ -54,7 +54,7 @@ solvers
     };
 }
 
-PISO
+PIMPLE
 {
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
diff --git a/tutorials/multiphase/settlingFoam/tank3D/system/fvSchemes b/tutorials/multiphase/settlingFoam/tank3D/system/fvSchemes
index bd9ad5764..481f33b8b 100644
--- a/tutorials/multiphase/settlingFoam/tank3D/system/fvSchemes
+++ b/tutorials/multiphase/settlingFoam/tank3D/system/fvSchemes
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/tank3D/system/fvSolution b/tutorials/multiphase/settlingFoam/tank3D/system/fvSolution
index 9fef9915b..43c6204f4 100644
--- a/tutorials/multiphase/settlingFoam/tank3D/system/fvSolution
+++ b/tutorials/multiphase/settlingFoam/tank3D/system/fvSolution
@@ -54,7 +54,7 @@ solvers
     };
 }
 
-PISO
+PIMPLE
 {
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes
index e6ed0c9f4..2be2a3bb0 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes
@@ -59,10 +59,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes
index 1ab260457..bc91a7aab 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes
@@ -61,10 +61,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes
index aa006066a..d934e5dd7 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes
@@ -59,10 +59,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/solidMechanics/deprecatedTutorials/contactStressFoam/ballAndBrick/system/fvSchemes b/tutorials/solidMechanics/deprecatedTutorials/contactStressFoam/ballAndBrick/system/fvSchemes
index 07aece0c4..af7a3908c 100644
--- a/tutorials/solidMechanics/deprecatedTutorials/contactStressFoam/ballAndBrick/system/fvSchemes
+++ b/tutorials/solidMechanics/deprecatedTutorials/contactStressFoam/ballAndBrick/system/fvSchemes
@@ -47,10 +47,4 @@ snGradSchemes
     default corrected;
 }
 
-fluxRequired
-{
-    default no;
-    U;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/fluid/system/fvSchemes b/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/fluid/system/fvSchemes
index 6a6dd96af..c1479fda7 100644
--- a/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/fluid/system/fvSchemes
+++ b/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/fluid/system/fvSchemes
@@ -55,10 +55,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/solid/system/fvSchemes b/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/solid/system/fvSchemes
index 7ce3a1593..a17b24de7 100644
--- a/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/solid/system/fvSchemes
+++ b/tutorials/solidMechanics/deprecatedTutorials/icoFsiFoam/flappingConsoleSmall/solid/system/fvSchemes
@@ -49,11 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    U;
-    T;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/solidMechanics/deprecatedTutorials/solidDisplacementFoam/plateHole/system/fvSchemes b/tutorials/solidMechanics/deprecatedTutorials/solidDisplacementFoam/plateHole/system/fvSchemes
index 56ccd5a82..3175b0a15 100644
--- a/tutorials/solidMechanics/deprecatedTutorials/solidDisplacementFoam/plateHole/system/fvSchemes
+++ b/tutorials/solidMechanics/deprecatedTutorials/solidDisplacementFoam/plateHole/system/fvSchemes
@@ -49,11 +49,4 @@ snGradSchemes
     default         none;
 }
 
-fluxRequired
-{
-    default         no;
-    D               yes;
-    T               no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/solidMechanics/deprecatedTutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes b/tutorials/solidMechanics/deprecatedTutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes
index 19590e014..86f7cc5f9 100644
--- a/tutorials/solidMechanics/deprecatedTutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes
+++ b/tutorials/solidMechanics/deprecatedTutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes
@@ -44,10 +44,4 @@ snGradSchemes
     default         uncorrected;
 }
 
-fluxRequired
-{
-    default         no;
-    D;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/solidMechanics/deprecatedTutorials/stressedFoam/plateHole/system/fvSchemes b/tutorials/solidMechanics/deprecatedTutorials/stressedFoam/plateHole/system/fvSchemes
index bc2a73b5a..8f95dc66d 100644
--- a/tutorials/solidMechanics/deprecatedTutorials/stressedFoam/plateHole/system/fvSchemes
+++ b/tutorials/solidMechanics/deprecatedTutorials/stressedFoam/plateHole/system/fvSchemes
@@ -50,9 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/fvSchemes b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/fvSchemes
index 21b5e93e2..bc7d2b1cc 100644
--- a/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/fvSchemes
+++ b/tutorials/solidMechanics/icoFsiElasticNonLinULSolidFoam/HronTurekFsi/fluid/system/fvSchemes
@@ -58,10 +58,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSchemes b/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSchemes
index 50109da88..3bd187129 100644
--- a/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSchemes
+++ b/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSchemes
@@ -50,9 +50,4 @@ snGradSchemes
     default corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSolution b/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSolution
index 8e79f00a2..465d36902 100644
--- a/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSolution
+++ b/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSolution
@@ -34,7 +34,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors            6;
     nCorrectors                 2;
diff --git a/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSchemes b/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSchemes
index 8ba1da03e..5d70d9763 100644
--- a/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSchemes
+++ b/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSchemes
@@ -49,9 +49,4 @@ snGradSchemes
     default corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSolution b/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSolution
index d25e93e30..2a5c70b26 100644
--- a/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSolution
+++ b/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSolution
@@ -34,7 +34,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors            5;
     nCorrectors                 2;
diff --git a/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSchemes b/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSchemes
index 7a77347bb..6a7bdb8c5 100644
--- a/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSchemes
+++ b/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSchemes
@@ -51,9 +51,4 @@ snGradSchemes
     default corrected;
 }
 
-fluxRequired
-{
-    p                   0;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSolution b/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSolution
index 30b9daefc..32af9de10 100644
--- a/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSolution
+++ b/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSolution
@@ -34,7 +34,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors            10;
     nCorrectors                 2;
diff --git a/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSchemes b/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSchemes
index 01cb826dc..469b1a5ac 100644
--- a/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSchemes
+++ b/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSchemes
@@ -49,9 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSolution b/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSolution
index 658fcc4f7..a227c32ac 100644
--- a/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSolution
+++ b/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSolution
@@ -34,7 +34,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors            10;
     nCorrectors                 2;
diff --git a/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSchemes b/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSchemes
index 2d73ad214..2aa0bd0bc 100644
--- a/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSchemes
+++ b/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSchemes
@@ -48,9 +48,4 @@ snGradSchemes
     default corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSolution b/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSolution
index 30b9daefc..32af9de10 100644
--- a/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSolution
+++ b/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSolution
@@ -34,7 +34,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors            10;
     nCorrectors                 2;
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/DCPP/system/fvSchemes b/tutorials/viscoelastic/viscoelasticFluidFoam/DCPP/system/fvSchemes
index abad537ae..bba183ccc 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/DCPP/system/fvSchemes
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/DCPP/system/fvSchemes
@@ -63,10 +63,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/system/fvSchemes b/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/system/fvSchemes
index 3e5833a60..b83b5014e 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/system/fvSchemes
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/system/fvSchemes
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/system/fvSchemes b/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/system/fvSchemes
index 5abff9188..8dcef9a94 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/system/fvSchemes
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/system/fvSchemes
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Feta-PTT/system/fvSchemes b/tutorials/viscoelastic/viscoelasticFluidFoam/Feta-PTT/system/fvSchemes
index 4391db454..08f4eb292 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/Feta-PTT/system/fvSchemes
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Feta-PTT/system/fvSchemes
@@ -58,10 +58,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/system/fvSchemes b/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/system/fvSchemes
index 4391db454..08f4eb292 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/system/fvSchemes
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/system/fvSchemes
@@ -58,10 +58,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/system/fvSchemes b/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/system/fvSchemes
index dbca98d38..5b3d8a578 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/system/fvSchemes
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/system/fvSchemes
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/system/fvSchemes b/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/system/fvSchemes
index 3e5833a60..b83b5014e 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/system/fvSchemes
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/system/fvSchemes
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Exponential/system/fvSchemes b/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Exponential/system/fvSchemes
index e3e8379aa..aedee55cc 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Exponential/system/fvSchemes
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Exponential/system/fvSchemes
@@ -58,10 +58,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/system/fvSchemes b/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/system/fvSchemes
index 5abff9188..8dcef9a94 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/system/fvSchemes
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/system/fvSchemes
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/system/fvSchemes b/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/system/fvSchemes
index 74d37ec7f..467993fe5 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/system/fvSchemes
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/system/fvSchemes
@@ -57,10 +57,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/WhiteMetzner/CarreauYasuda/system/fvSchemes b/tutorials/viscoelastic/viscoelasticFluidFoam/WhiteMetzner/CarreauYasuda/system/fvSchemes
index 3e5833a60..b83b5014e 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/WhiteMetzner/CarreauYasuda/system/fvSchemes
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/WhiteMetzner/CarreauYasuda/system/fvSchemes
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/system/fvSchemes b/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/system/fvSchemes
index 4feeacc8b..49ac3846a 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/system/fvSchemes
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/system/fvSchemes
@@ -69,10 +69,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/system/fvSchemes b/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/system/fvSchemes
index e6d8b419c..94459c878 100644
--- a/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/system/fvSchemes
+++ b/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/system/fvSchemes
@@ -62,11 +62,5 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 
 // ************************************************************************* //