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 9bf40b3a6..fb5848c09 100644
--- a/applications/solvers/compressible/steadyCompressibleFoam/createFields.H
+++ b/applications/solvers/compressible/steadyCompressibleFoam/createFields.H
@@ -53,3 +53,5 @@
             thermo
         )
     );
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H b/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H
index 79bc5c6a7..f6cd2ceaa 100644
--- a/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H
@@ -24,8 +24,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 355dae922..baf9f1625 100644
--- a/applications/solvers/compressible/steadyCompressibleFoam/pEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleFoam/pEqn.H
@@ -8,7 +8,7 @@
     surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p);
 
     // --- PISO loop
-    for (int corr = 0; corr < nCorr; corr++)
+    while (pimple.correct())
     {
         U = rUA*UEqn.H();
 
@@ -21,7 +21,7 @@
 
         p.storePrevIter();
 
-        for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+        while (pimple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
@@ -31,16 +31,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 00073568e..cbe7631a7 100644
--- a/applications/solvers/compressible/steadyCompressibleMRFFoam/createFields.H
+++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/createFields.H
@@ -94,3 +94,5 @@
         h
     );
     i -= 0.5*magSqr(Urot);
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/hEqn.H b/applications/solvers/compressible/steadyCompressibleMRFFoam/hEqn.H
index 08392027f..0579637b9 100644
--- a/applications/solvers/compressible/steadyCompressibleMRFFoam/hEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/hEqn.H
@@ -20,9 +20,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 ca500d7af..00596aa6d 100644
--- a/applications/solvers/compressible/steadyCompressibleMRFFoam/iEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/iEqn.H
@@ -35,8 +35,7 @@
 
     iEqn.relax();
 
-    eqnResidual = iEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
+    iEqn.solve();
 
     // Calculate enthalpy out of rothalpy
     h = i + 0.5*magSqr(Urot);
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 b45e1573d..c0997ecf6 100644
--- a/applications/solvers/compressible/steadyCompressibleMRFFoam/pEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/pEqn.H
@@ -7,7 +7,7 @@
     // Needs to be outside of loop since p is changing, but psi and rho are not.
     surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p);
 
-    for (int corr = 0; corr < nCorr; corr++)
+    while (pimple.correct())
     {
         U = rUA*UEqn.H();
 
@@ -25,7 +25,7 @@
 
         p.storePrevIter();
 
-        for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+        while (pimple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
@@ -35,16 +35,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 6b84b46ba..d4e5aed10 100644
--- a/applications/solvers/compressible/steadyCompressibleSRFFoam/createFields.H
+++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/createFields.H
@@ -101,3 +101,5 @@
         h
     );
     i -= 0.5*magSqr(SRF->U());
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/iEqn.H b/applications/solvers/compressible/steadyCompressibleSRFFoam/iEqn.H
index f4d8af891..5b7ab5b9f 100644
--- a/applications/solvers/compressible/steadyCompressibleSRFFoam/iEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/iEqn.H
@@ -24,8 +24,7 @@
 
     iEqn.relax();
 
-    eqnResidual = iEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
+    iEqn.solve();
 
     // Calculate enthalpy out of rothalpy
     volVectorField Urot("Urot", SRF->U());
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 f161a3c4d..ce6089e9c 100644
--- a/applications/solvers/compressible/steadyCompressibleSRFFoam/pEqn.H
+++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/pEqn.H
@@ -7,7 +7,7 @@
     // Needs to be outside of loop since p is changing, but psi and rho are not.
     surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p);
 
-    for (int corr = 0; corr < nCorr; corr++)
+    while (pimple.correct())
     {
         Urel = rUrelA*UrelEqn.H();
 
@@ -20,7 +20,7 @@
 
         p.storePrevIter();
 
-        for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+        while (pimple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
@@ -30,16 +30,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 87a48982b..5c7ad2d43 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 "iEqn.H"
 #       include "pEqn.H"
@@ -80,8 +80,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/tutorials/compressible/steadyCompressibleFoam/2bump/system/fvSchemes b/tutorials/compressible/steadyCompressibleFoam/2bump/system/fvSchemes
index e30479824..1fff3eaa1 100644
--- a/tutorials/compressible/steadyCompressibleFoam/2bump/system/fvSchemes
+++ b/tutorials/compressible/steadyCompressibleFoam/2bump/system/fvSchemes
@@ -48,7 +48,7 @@ divSchemes
 
     div(phi,k)       Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div((muEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -66,10 +66,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 ee56aaa93..e40557440 100644
--- a/tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/polyMesh/boundary
+++ b/tutorials/compressible/steadyCompressibleFoam/transonicBump/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/steadyCompressibleFoam/transonicBump/system/fvSchemes b/tutorials/compressible/steadyCompressibleFoam/transonicBump/system/fvSchemes
index 8c0c582e2..67b89fe25 100644
--- a/tutorials/compressible/steadyCompressibleFoam/transonicBump/system/fvSchemes
+++ b/tutorials/compressible/steadyCompressibleFoam/transonicBump/system/fvSchemes
@@ -48,7 +48,7 @@ divSchemes
 
     div(phi,k)       Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div((muEff*dev2(T(grad(U))))) Gauss linear;
 
     div(U,p)         Gauss linear;
 
@@ -70,10 +70,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 8c06e27f8..bd4bb9360 100644
--- a/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/constant/polyMesh/boundary
+++ b/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/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/steadyCompressibleMRFFoam/bentRotorStator/system/fvSchemes b/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/system/fvSchemes
index 168edcee9..2a25d0e03 100644
--- a/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/system/fvSchemes
+++ b/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/system/fvSchemes
@@ -48,7 +48,7 @@ divSchemes
 
     div(phi,k)       Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div((muEff*dev2(T(grad(U))))) Gauss linear;
 
     div(U,p)       Gauss linear;
 }
@@ -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 8c06e27f8..bd4bb9360 100644
--- a/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/constant/polyMesh/boundary
+++ b/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/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/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSchemes b/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSchemes
index 1bb70c9ee..9909be988 100644
--- a/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSchemes
+++ b/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSchemes
@@ -44,7 +44,7 @@ divSchemes
 
     div(phi,k)       Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div((muEff*dev2(T(grad(U))))) Gauss linear;
 
     div(U,p)       Gauss linear;
 }
@@ -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 7937839af..0f18bdcde 100644
--- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/constant/polyMesh/boundary
+++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/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/steadyCompressibleSRFFoam/bentBlade/system/fvSchemes b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSchemes
index abc8edd65..aad1ab6c3 100644
--- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSchemes
+++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSchemes
@@ -44,7 +44,7 @@ divSchemes
 
     div(phi,k)       Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev2(grad(Urel).T()))) Gauss linear;
+    div((muEff*dev2(T(grad(Urel))))) Gauss linear;
 
     div(U,p)         Gauss linear;
 
@@ -65,10 +65,4 @@ snGradSchemes
     default           corrected;
 }
 
-fluxRequired
-{
-    default           no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/constant/polyMesh/boundary b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/constant/polyMesh/boundary
index 7937839af..0f18bdcde 100644
--- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/constant/polyMesh/boundary
+++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/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/steadyCompressibleSRFFoam/simpleBlade/system/fvSchemes b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSchemes
index abc8edd65..aad1ab6c3 100644
--- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSchemes
+++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSchemes
@@ -44,7 +44,7 @@ divSchemes
 
     div(phi,k)       Gauss upwind;
     div(phi,epsilon) Gauss upwind;
-    div((muEff*dev2(grad(Urel).T()))) Gauss linear;
+    div((muEff*dev2(T(grad(Urel))))) Gauss linear;
 
     div(U,p)         Gauss linear;
 
@@ -65,10 +65,4 @@ snGradSchemes
     default           corrected;
 }
 
-fluxRequired
-{
-    default           no;
-    p;
-}
-
 // ************************************************************************* //