From 42c61d36a3765207b916b93d1a2ffdc2674df66c Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Sat, 9 Apr 2016 18:17:55 +0200
Subject: [PATCH 01/55] Backport setReference from vanilla 3.0.1

---
 .../solvers/basic/potentialDyMFoam/correctPhi.H       |  4 +++-
 .../solvers/engine/icoDyMEngineFoam/correctPhi.H      |  4 +++-
 .../solvers/engine/turbDyMEngineFoam/correctPhi.H     |  4 +++-
 .../solvers/immersedBoundary/interIbFoam/correctPhi.H |  2 ++
 .../solvers/incompressible/icoDyMFoam/correctPhi.H    |  4 +++-
 .../incompressible/icoDyMSimpleFoam/correctPhi.H      |  2 ++
 .../solvers/incompressible/icoFoam/createFields.H     |  1 +
 .../solvers/incompressible/pimpleDyMFoam/correctPhi.H | 10 ++++++----
 .../multiphase/compressibleInterDyMFoam/correctPhi.H  |  4 +++-
 .../solvers/multiphase/interDyMFoam/correctPhi.H      |  2 ++
 .../solvers/multiphase/interFoam/correctPhi.H         |  2 ++
 .../multiphase/interPhaseChangeFoam/correctPhi.H      |  2 ++
 src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C   | 11 +++++++++++
 src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H   |  4 +++-
 .../incompressible/icoFoam/cavity/system/fvSchemes    |  6 ------
 15 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/applications/solvers/basic/potentialDyMFoam/correctPhi.H b/applications/solvers/basic/potentialDyMFoam/correctPhi.H
index 9a32c5ecc..6c78a0960 100644
--- a/applications/solvers/basic/potentialDyMFoam/correctPhi.H
+++ b/applications/solvers/basic/potentialDyMFoam/correctPhi.H
@@ -34,7 +34,9 @@
         fvc::makeAbsolute(phi, U);
     }
 
-    for(int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+    mesh.setFluxRequired(pcorr.name());
+
+    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pcorrEqn
         (
diff --git a/applications/solvers/engine/icoDyMEngineFoam/correctPhi.H b/applications/solvers/engine/icoDyMEngineFoam/correctPhi.H
index 0f6422d53..15ce43ec7 100644
--- a/applications/solvers/engine/icoDyMEngineFoam/correctPhi.H
+++ b/applications/solvers/engine/icoDyMEngineFoam/correctPhi.H
@@ -24,7 +24,9 @@
         pcorrTypes
     );
 
-    phi = (fvc::interpolate(U) & mesh.Sf());
+    phi = fvc::interpolate(U) & mesh.Sf();
+
+    mesh.setFluxRequired(pcorr.name());
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
diff --git a/applications/solvers/engine/turbDyMEngineFoam/correctPhi.H b/applications/solvers/engine/turbDyMEngineFoam/correctPhi.H
index 0f6422d53..15ce43ec7 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/correctPhi.H
+++ b/applications/solvers/engine/turbDyMEngineFoam/correctPhi.H
@@ -24,7 +24,9 @@
         pcorrTypes
     );
 
-    phi = (fvc::interpolate(U) & mesh.Sf());
+    phi = fvc::interpolate(U) & mesh.Sf();
+
+    mesh.setFluxRequired(pcorr.name());
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
diff --git a/applications/solvers/immersedBoundary/interIbFoam/correctPhi.H b/applications/solvers/immersedBoundary/interIbFoam/correctPhi.H
index cf979e1d1..9945bf708 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/correctPhi.H
+++ b/applications/solvers/immersedBoundary/interIbFoam/correctPhi.H
@@ -36,6 +36,8 @@
     immersedBoundaryAdjustPhi(phi, U);
     adjustPhi(phi, U, pcorr);
 
+    mesh.setFluxRequired(pcorr.name());
+
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pcorrEqn
diff --git a/applications/solvers/incompressible/icoDyMFoam/correctPhi.H b/applications/solvers/incompressible/icoDyMFoam/correctPhi.H
index 9a32c5ecc..6c78a0960 100644
--- a/applications/solvers/incompressible/icoDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/icoDyMFoam/correctPhi.H
@@ -34,7 +34,9 @@
         fvc::makeAbsolute(phi, U);
     }
 
-    for(int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+    mesh.setFluxRequired(pcorr.name());
+
+    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pcorrEqn
         (
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H b/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H
index 69978f0e6..3f9a190d4 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H
@@ -24,6 +24,8 @@
         pcorrTypes
     );
 
+    mesh.setFluxRequired(pcorr.name());
+
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pcorrEqn
diff --git a/applications/solvers/incompressible/icoFoam/createFields.H b/applications/solvers/incompressible/icoFoam/createFields.H
index 6a7d6b9a8..f2374b961 100644
--- a/applications/solvers/incompressible/icoFoam/createFields.H
+++ b/applications/solvers/incompressible/icoFoam/createFields.H
@@ -53,3 +53,4 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H b/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
index ce45e1bd3..27d7c9113 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
@@ -7,7 +7,7 @@
         zeroGradientFvPatchScalarField::typeName
     );
 
-    for (label i = 0; i < p.boundaryField().size(); i++)
+    for (label i=0; i<p.boundaryField().size(); i++)
     {
         if (p.boundaryField()[i].fixesValue())
         {
@@ -26,7 +26,7 @@
             IOobject::NO_WRITE
         ),
         mesh,
-        dimensionedScalar("pcorr", p.dimensions(), 0),
+        dimensionedScalar("pcorr", p.dimensions(), 0.0),
         pcorrTypes
     );
 
@@ -35,7 +35,9 @@
 
     adjustPhi(phi, U, pcorr);
 
-    for(int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+    mesh.setFluxRequired(pcorr.name());
+
+    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pcorrEqn
         (
@@ -53,6 +55,6 @@
         // Fluxes are corrected to absolute velocity and further corrected
         // later.  HJ, 6/Feb/2009
     }
-
 #   include "continuityErrs.H"
 }
+
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H
index f681ba659..dd3ddc486 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H
@@ -42,6 +42,8 @@
 
     adjustPhi(phi, U, pcorr);
 
+    mesh.setFluxRequired(pcorr.name());
+
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pcorrEqn
@@ -57,5 +59,5 @@
         }
     }
 
-    #include "continuityErrs.H"
+#   include "continuityErrs.H"
 }
diff --git a/applications/solvers/multiphase/interDyMFoam/correctPhi.H b/applications/solvers/multiphase/interDyMFoam/correctPhi.H
index 35d62b8bc..33f3f08a6 100644
--- a/applications/solvers/multiphase/interDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interDyMFoam/correctPhi.H
@@ -27,6 +27,8 @@
 
     adjustPhi(phi, U, pcorr);
 
+    mesh.setFluxRequired(pcorr.name());
+
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pcorrEqn
diff --git a/applications/solvers/multiphase/interFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/correctPhi.H
index ed5ccc9a7..f8988a54c 100644
--- a/applications/solvers/multiphase/interFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/correctPhi.H
@@ -34,6 +34,8 @@
 
     adjustPhi(phi, U, pcorr);
 
+    mesh.setFluxRequired(pcorr.name());
+
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pcorrEqn
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H b/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
index ed5ccc9a7..f8988a54c 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
@@ -34,6 +34,8 @@
 
     adjustPhi(phi, U, pcorr);
 
+    mesh.setFluxRequired(pcorr.name());
+
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pcorrEqn
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
index 63afcda3e..af928c595 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
@@ -572,6 +572,17 @@ Foam::ITstream& Foam::fvSchemes::laplacianScheme(const word& name) const
 }
 
 
+void Foam::fvSchemes::setFluxRequired(const word& name) const
+{
+    if (debug)
+    {
+        Info<< "Setting fluxRequired for " << name << endl;
+    }
+
+    fluxRequired_.add(name, true, true);
+}
+
+
 bool Foam::fvSchemes::fluxRequired(const word& name) const
 {
     if (debug)
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
index 2ad2cde02..44b5ea0d6 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
@@ -76,7 +76,7 @@ class fvSchemes
         dictionary laplacianSchemes_;
         ITstream defaultLaplacianScheme_;
 
-        dictionary fluxRequired_;
+        mutable dictionary fluxRequired_;
         bool defaultFluxRequired_;
 
         dictionary cacheFields_;
@@ -126,6 +126,8 @@ public:
 
             ITstream& laplacianScheme(const word& name) const;
 
+            void setFluxRequired(const word& name) const;
+
             bool fluxRequired(const word& name) const;
 
             bool cache(const word& name) const;
diff --git a/tutorials/incompressible/icoFoam/cavity/system/fvSchemes b/tutorials/incompressible/icoFoam/cavity/system/fvSchemes
index 277df7d18..e807e470c 100644
--- a/tutorials/incompressible/icoFoam/cavity/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavity/system/fvSchemes
@@ -49,10 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //

From 9213922a1857f4f117fc86859bbd4d0fe506be08 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sat, 9 Apr 2016 22:55:19 +0200
Subject: [PATCH 02/55] Modified pisoFoam according to vanilla 3.0.1

---
 .../incompressible/pisoFoam/pisoFoam.C        | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index 5dadd3953..67f634291 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -34,15 +34,19 @@ Description
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulenceModel.H"
+#include "pisoControl.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
 {
 #   include "setRootCase.H"
-
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 
@@ -54,7 +58,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPISOControls.H"
 #       include "CourantNo.H"
 
         // Pressure-velocity PISO corrector
@@ -70,14 +73,14 @@ int main(int argc, char *argv[])
 
             UEqn.relax();
 
-            if (momentumPredictor)
+            if (piso.momentumPredictor())
             {
                 solve(UEqn == -fvc::grad(p));
             }
 
             // --- PISO loop
 
-            for (int corr = 0; corr < nCorr; corr++)
+            while (piso.correct())
             {
                 volScalarField rUA = 1.0/UEqn.A();
 
@@ -88,7 +91,7 @@ int main(int argc, char *argv[])
                 adjustPhi(phi, U, p);
 
                 // Non-orthogonal pressure corrector loop
-                for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+                while (piso.correctNonOrthogonal())
                 {
                     // Pressure corrector
 
@@ -99,11 +102,7 @@ int main(int argc, char *argv[])
 
                     pEqn.setReference(pRefCell, pRefValue);
 
-                    if
-                    (
-                        corr == nCorr-1
-                     && nonOrth == nNonOrthCorr
-                    )
+                    if (piso.finalInnerIter())
                     {
                         pEqn.solve(mesh.solutionDict().solver("pFinal"));
                     }
@@ -112,7 +111,7 @@ int main(int argc, char *argv[])
                         pEqn.solve();
                     }
 
-                    if (nonOrth == nNonOrthCorr)
+                    if (piso.finalNonOrthogonalIter())
                     {
                         phi -= pEqn.flux();
                     }

From 964b873d22e1d9a40fcf1543b52af1e3ffdd31af Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sat, 9 Apr 2016 23:07:25 +0200
Subject: [PATCH 03/55] Added solutionControl class from vanilla 3.0.1

---
 src/finiteVolume/Make/files                   |   6 +
 .../pimpleControl/pimpleControl.C             | 239 +++++++++++++++++
 .../pimpleControl/pimpleControl.H             | 163 ++++++++++++
 .../pimpleControl/pimpleControlI.H            | 101 ++++++++
 .../solutionControl/pisoControl/pisoControl.C |  50 ++++
 .../solutionControl/pisoControl/pisoControl.H |  86 +++++++
 .../simpleControl/simpleControl.C             | 157 ++++++++++++
 .../simpleControl/simpleControl.H             | 111 ++++++++
 .../solutionControl/solutionControl.C         | 242 ++++++++++++++++++
 .../solutionControl/solutionControl.H         | 231 +++++++++++++++++
 .../solutionControl/solutionControlI.H        |  98 +++++++
 .../solutionControlTemplates.C                |  62 +++++
 12 files changed, 1546 insertions(+)
 create mode 100644 src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
 create mode 100644 src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
 create mode 100644 src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H
 create mode 100644 src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.C
 create mode 100644 src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H
 create mode 100644 src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
 create mode 100644 src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
 create mode 100644 src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
 create mode 100644 src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
 create mode 100644 src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlI.H
 create mode 100644 src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlTemplates.C

diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 3fb994320..1c0fe963a 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -396,6 +396,12 @@ $(general)/findRefCell/findRefCell.C
 $(general)/adjustPhi/adjustPhi.C
 $(general)/bound/bound.C
 
+solutionControl = $(general)/solutionControl
+$(solutionControl)/solutionControl/solutionControl.C
+$(solutionControl)/simpleControl/simpleControl.C
+$(solutionControl)/pimpleControl/pimpleControl.C
+$(solutionControl)/pisoControl/pisoControl.C
+
 porousMedia = $(general)/porousMedia
 $(porousMedia)/porousZone.C
 $(porousMedia)/porousZones.C
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
new file mode 100644
index 000000000..94ef2a965
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
@@ -0,0 +1,239 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "pimpleControl.H"
+#include "Switch.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(pimpleControl, 0);
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::pimpleControl::read()
+{
+    solutionControl::read(false);
+
+    // Read solution controls
+    const dictionary& pimpleDict = dict();
+    nCorrPIMPLE_ = pimpleDict.lookupOrDefault<label>("nOuterCorrectors", 1);
+    nCorrPISO_ = pimpleDict.lookupOrDefault<label>("nCorrectors", 1);
+    turbOnFinalIterOnly_ =
+        pimpleDict.lookupOrDefault<Switch>("turbOnFinalIterOnly", true);
+}
+
+
+bool Foam::pimpleControl::criteriaSatisfied()
+{
+    // no checks on first iteration - nothing has been calculated yet
+    if ((corr_ == 1) || residualControl_.empty() || finalIter())
+    {
+        return false;
+    }
+
+
+    bool storeIni = this->storeInitialResiduals();
+
+    bool achieved = true;
+    bool checked = false;    // safety that some checks were indeed performed
+
+    const dictionary& solverDict = mesh_.solverPerformanceDict();
+    forAllConstIter(dictionary, solverDict, iter)
+    {
+        const word& variableName = iter().keyword();
+        const label fieldI = applyToField(variableName);
+        if (fieldI != -1)
+        {
+            scalar residual = 0;
+            const scalar firstResidual =
+                maxResidual(variableName, iter().stream(), residual);
+
+            checked = true;
+
+            if (storeIni)
+            {
+                residualControl_[fieldI].initialResidual = firstResidual;
+            }
+
+            const bool absCheck = residual < residualControl_[fieldI].absTol;
+            bool relCheck = false;
+
+            scalar relative = 0.0;
+            if (!storeIni)
+            {
+                const scalar iniRes =
+                    residualControl_[fieldI].initialResidual
+                  + ROOTVSMALL;
+
+                relative = residual/iniRes;
+                relCheck = relative < residualControl_[fieldI].relTol;
+            }
+
+            achieved = achieved && (absCheck || relCheck);
+
+            if (debug)
+            {
+                Info<< algorithmName_ << " loop:" << endl;
+
+                Info<< "    " << variableName
+                    << " PIMPLE iter " << corr_
+                    << ": ini res = "
+                    << residualControl_[fieldI].initialResidual
+                    << ", abs tol = " << residual
+                    << " (" << residualControl_[fieldI].absTol << ")"
+                    << ", rel tol = " << relative
+                    << " (" << residualControl_[fieldI].relTol << ")"
+                    << endl;
+            }
+        }
+    }
+
+    return checked && achieved;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::pimpleControl::pimpleControl(fvMesh& mesh, const word& dictName)
+:
+    solutionControl(mesh, dictName),
+    nCorrPIMPLE_(0),
+    nCorrPISO_(0),
+    corrPISO_(0),
+    turbOnFinalIterOnly_(true),
+    converged_(false)
+{
+    read();
+
+    if (nCorrPIMPLE_ > 1)
+    {
+        Info<< nl;
+        if (residualControl_.empty())
+        {
+            Info<< algorithmName_ << ": no residual control data found. "
+                << "Calculations will employ " << nCorrPIMPLE_
+                << " corrector loops" << nl << endl;
+        }
+        else
+        {
+            Info<< algorithmName_ << ": max iterations = " << nCorrPIMPLE_
+                << endl;
+            forAll(residualControl_, i)
+            {
+                Info<< "    field " << residualControl_[i].name << token::TAB
+                    << ": relTol " << residualControl_[i].relTol
+                    << ", tolerance " << residualControl_[i].absTol
+                    << nl;
+            }
+            Info<< endl;
+        }
+    }
+    else
+    {
+        Info<< nl << algorithmName_ << ": Operating solver in PISO mode" << nl
+            << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::pimpleControl::~pimpleControl()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::pimpleControl::loop()
+{
+    read();
+
+    corr_++;
+
+    if (debug)
+    {
+        Info<< algorithmName_ << " loop: corr = " << corr_ << endl;
+    }
+
+    if (corr_ == nCorrPIMPLE_ + 1)
+    {
+        if ((!residualControl_.empty()) && (nCorrPIMPLE_ != 1))
+        {
+            Info<< algorithmName_ << ": not converged within "
+                << nCorrPIMPLE_ << " iterations" << endl;
+        }
+
+        corr_ = 0;
+        mesh_.data::remove("finalIteration");
+        return false;
+    }
+
+    bool completed = false;
+    if (converged_ || criteriaSatisfied())
+    {
+        if (converged_)
+        {
+            Info<< algorithmName_ << ": converged in " << corr_ - 1
+                << " iterations" << endl;
+
+            mesh_.data::remove("finalIteration");
+            corr_ = 0;
+            converged_ = false;
+
+            completed = true;
+        }
+        else
+        {
+            Info<< algorithmName_ << ": iteration " << corr_ << endl;
+            storePrevIterFields();
+
+            mesh_.data::add("finalIteration", true);
+            converged_ = true;
+        }
+    }
+    else
+    {
+        if (finalIter())
+        {
+            mesh_.data::add("finalIteration", true);
+        }
+
+        if (corr_ <= nCorrPIMPLE_)
+        {
+            Info<< algorithmName_ << ": iteration " << corr_ << endl;
+            storePrevIterFields();
+            completed = false;
+        }
+    }
+
+    return !completed;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
new file mode 100644
index 000000000..8eff81f4b
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::pimpleControl
+
+Description
+    PIMPLE control class to supply convergence information/checks for
+    the PIMPLE loop.
+
+    May also be used to for PISO-based algorithms as PISO controls are a
+    sub-set of PIMPLE controls.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef pimpleControl_H
+#define pimpleControl_H
+
+#include "solutionControl.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class pimpleControl Declaration
+\*---------------------------------------------------------------------------*/
+
+class pimpleControl
+:
+    public solutionControl
+{
+    // Private member functions
+
+        //- Disallow default bitwise copy construct
+        pimpleControl(const pimpleControl&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const pimpleControl&);
+
+
+protected:
+
+    // Protected data
+
+        // Solution controls
+
+            //- Maximum number of PIMPLE correctors
+            label nCorrPIMPLE_;
+
+            //- Maximum number of PISO correctors
+            label nCorrPISO_;
+
+            //- Current PISO corrector
+            label corrPISO_;
+
+            //- Flag to indicate whether to only solve turbulence on final iter
+            bool turbOnFinalIterOnly_;
+
+            //- Converged flag
+            bool converged_;
+
+
+    // Protected Member Functions
+
+        //- Read controls from fvSolution dictionary
+        virtual void read();
+
+        //- Return true if all convergence checks are satisfied
+        virtual bool criteriaSatisfied();
+
+
+public:
+
+    // Static Data Members
+
+        //- Run-time type information
+        TypeName("pimpleControl");
+
+
+    // Constructors
+
+        //- Construct from mesh and the name of control sub-dictionary
+        pimpleControl(fvMesh& mesh, const word& dictName="PIMPLE");
+
+
+    //- Destructor
+    virtual ~pimpleControl();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Maximum number of PIMPLE correctors
+            inline label nCorrPIMPLE() const;
+
+            //- Maximum number of PISO correctors
+            inline label nCorrPISO() const;
+
+            //- Current PISO corrector index
+            inline label corrPISO() const;
+
+
+        // Solution control
+
+            //- PIMPLE loop
+            virtual bool loop();
+
+            //- Pressure corrector loop
+            inline bool correct();
+
+            //- Helper function to identify when to store the intial residuals
+            inline bool storeInitialResiduals() const;
+
+            //- Helper function to identify first PIMPLE (outer) iteration
+            inline bool firstIter() const;
+
+            //- Helper function to identify final PIMPLE (outer) iteration
+            inline bool finalIter() const;
+
+            //- Helper function to identify final inner iteration
+            inline bool finalInnerIter() const;
+
+            //- Helper function to identify whether to solve for turbulence
+            inline bool turbCorr() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "pimpleControlI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H
new file mode 100644
index 000000000..c8f70e8bb
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline Foam::label Foam::pimpleControl::nCorrPIMPLE() const
+{
+    return nCorrPIMPLE_;
+}
+
+
+inline Foam::label Foam::pimpleControl::nCorrPISO() const
+{
+    return nCorrPISO_;
+}
+
+
+inline Foam::label Foam::pimpleControl::corrPISO() const
+{
+    return corrPISO_;
+}
+
+
+inline bool Foam::pimpleControl::correct()
+{
+    corrPISO_++;
+
+    if (debug)
+    {
+        Info<< algorithmName_ << " correct: corrPISO = " << corrPISO_ << endl;
+    }
+
+    if (corrPISO_ <= nCorrPISO_)
+    {
+        return true;
+    }
+    else
+    {
+        corrPISO_ = 0;
+        return false;
+    }
+}
+
+
+inline bool Foam::pimpleControl::storeInitialResiduals() const
+{
+    // Start from second PIMPLE iteration
+    return (corr_ == 2) && (corrPISO_ == 0) && (corrNonOrtho_ == 0);
+}
+
+
+inline bool Foam::pimpleControl::firstIter() const
+{
+    return corr_ == 1;
+}
+
+
+inline bool Foam::pimpleControl::finalIter() const
+{
+    return converged_ || (corr_ == nCorrPIMPLE_);
+}
+
+
+inline bool Foam::pimpleControl::finalInnerIter() const
+{
+    return
+       finalIter()
+    && corrPISO_ == nCorrPISO_
+    && corrNonOrtho_ == nNonOrthCorr_ + 1;
+}
+
+
+inline bool Foam::pimpleControl::turbCorr() const
+{
+    return !turbOnFinalIterOnly_ || finalIter();
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.C
new file mode 100644
index 000000000..c38adac57
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.C
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "pisoControl.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(pisoControl, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::pisoControl::pisoControl(fvMesh& mesh, const word& dictName)
+:
+    pimpleControl(mesh, dictName)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::pisoControl::~pisoControl()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H
new file mode 100644
index 000000000..c14dd8b74
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::pisoControl
+
+Description
+    Specialization of the pimpleControl class for PISO control.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef pisoControl_H
+#define pisoControl_H
+
+#include "pimpleControl.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class pisoControl Declaration
+\*---------------------------------------------------------------------------*/
+
+class pisoControl
+:
+    public pimpleControl
+{
+    // Private member functions
+
+        //- Disallow default bitwise copy construct
+        pisoControl(const pisoControl&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const pisoControl&);
+
+
+public:
+
+    // Static Data Members
+
+        //- Run-time type information
+        TypeName("pisoControl");
+
+
+    // Constructors
+
+        //- Construct from mesh and the name of control sub-dictionary
+        pisoControl(fvMesh& mesh, const word& dictName="PISO");
+
+
+    //- Destructor
+    virtual ~pisoControl();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
new file mode 100644
index 000000000..c7bced189
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
@@ -0,0 +1,157 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "simpleControl.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(simpleControl, 0);
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::simpleControl::read()
+{
+    solutionControl::read(true);
+}
+
+
+bool Foam::simpleControl::criteriaSatisfied()
+{
+    if (residualControl_.empty())
+    {
+        return false;
+    }
+
+    bool achieved = true;
+    bool checked = false;    // safety that some checks were indeed performed
+
+    const dictionary& solverDict = mesh_.solverPerformanceDict();
+    forAllConstIter(dictionary, solverDict, iter)
+    {
+        const word& variableName = iter().keyword();
+        const label fieldI = applyToField(variableName);
+        if (fieldI != -1)
+        {
+            scalar lastResidual = 0;
+            const scalar residual =
+                maxResidual(variableName, iter().stream(), lastResidual);
+
+            checked = true;
+
+            bool absCheck = residual < residualControl_[fieldI].absTol;
+            achieved = achieved && absCheck;
+
+            if (debug)
+            {
+                Info<< algorithmName_ << " solution statistics:" << endl;
+
+                Info<< "    " << variableName << ": tolerance = " << residual
+                    << " (" << residualControl_[fieldI].absTol << ")"
+                    << endl;
+            }
+        }
+    }
+
+    return checked && achieved;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::simpleControl::simpleControl(fvMesh& mesh)
+:
+    solutionControl(mesh, "SIMPLE"),
+    initialised_(false)
+{
+    read();
+
+    Info<< nl;
+
+    if (residualControl_.empty())
+    {
+        Info<< algorithmName_ << ": no convergence criteria found. "
+            << "Calculations will run for " << mesh_.time().endTime().value()
+            << " steps." << nl << endl;
+    }
+    else
+    {
+        Info<< algorithmName_ << ": convergence criteria" << nl;
+        forAll(residualControl_, i)
+        {
+            Info<< "    field " << residualControl_[i].name << token::TAB
+                << " tolerance " << residualControl_[i].absTol
+                << nl;
+        }
+        Info<< endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::simpleControl::~simpleControl()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::simpleControl::loop()
+{
+    read();
+
+    Time& time = const_cast<Time&>(mesh_.time());
+
+    if (initialised_)
+    {
+        if (criteriaSatisfied())
+        {
+            Info<< nl << algorithmName_ << " solution converged in "
+                << time.timeName() << " iterations" << nl << endl;
+
+            // Set to finalise calculation
+            time.writeAndEnd();
+        }
+        else
+        {
+            storePrevIterFields();
+        }
+    }
+    else
+    {
+        initialised_ = true;
+        storePrevIterFields();
+    }
+
+
+    return time.loop();
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
new file mode 100644
index 000000000..74f68d390
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::simpleControl
+
+Description
+    SIMPLE control class to supply convergence information/checks for
+    the SIMPLE loop.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef simpleControl_H
+#define simpleControl_H
+
+#include "solutionControl.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class simpleControl Declaration
+\*---------------------------------------------------------------------------*/
+
+class simpleControl
+:
+    public solutionControl
+{
+
+protected:
+
+    // Protected Data
+
+        //- Initialised flag
+        bool initialised_;
+
+
+    // Protected Member Functions
+
+        //- Read controls from fvSolution dictionary
+        void read();
+
+        //- Return true if all convergence checks are satisfied
+        bool criteriaSatisfied();
+
+        //- Disallow default bitwise copy construct
+        simpleControl(const simpleControl&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const simpleControl&);
+
+
+public:
+
+
+    // Static Data Members
+
+        //- Run-time type information
+        TypeName("simpleControl");
+
+
+    // Constructors
+
+        //- Construct from mesh
+        simpleControl(fvMesh& mesh);
+
+
+    //- Destructor
+    virtual ~simpleControl();
+
+
+    // Member Functions
+
+        // Solution control
+
+            //- Loop loop
+            virtual bool loop();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
new file mode 100644
index 000000000..82ba01670
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
@@ -0,0 +1,242 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "solutionControl.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(solutionControl, 0);
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::solutionControl::read(const bool absTolOnly)
+{
+    const dictionary& solutionDict = this->dict();
+
+    // Read solution controls
+    nNonOrthCorr_ =
+        solutionDict.lookupOrDefault<label>("nNonOrthogonalCorrectors", 0);
+    momentumPredictor_ =
+        solutionDict.lookupOrDefault("momentumPredictor", true);
+    transonic_ = solutionDict.lookupOrDefault("transonic", false);
+    consistent_ = solutionDict.lookupOrDefault("consistent", false);
+
+    // Read residual information
+    const dictionary residualDict
+    (
+        solutionDict.subOrEmptyDict("residualControl")
+    );
+
+    DynamicList<fieldData> data(residualControl_);
+
+    forAllConstIter(dictionary, residualDict, iter)
+    {
+        const word& fName = iter().keyword();
+        const label fieldI = applyToField(fName, false);
+        if (fieldI == -1)
+        {
+            fieldData fd;
+            fd.name = fName.c_str();
+
+            if (absTolOnly)
+            {
+                fd.absTol = readScalar(residualDict.lookup(fName));
+                fd.relTol = -1;
+                fd.initialResidual = -1;
+            }
+            else
+            {
+                if (iter().isDict())
+                {
+                    const dictionary& fieldDict(iter().dict());
+                    fd.absTol = readScalar(fieldDict.lookup("tolerance"));
+                    fd.relTol = readScalar(fieldDict.lookup("relTol"));
+                    fd.initialResidual = 0.0;
+                }
+                else
+                {
+                    FatalErrorInFunction
+                        << "Residual data for " << iter().keyword()
+                        << " must be specified as a dictionary"
+                        << exit(FatalError);
+                }
+            }
+
+            data.append(fd);
+        }
+        else
+        {
+            fieldData& fd = data[fieldI];
+            if (absTolOnly)
+            {
+                fd.absTol = readScalar(residualDict.lookup(fName));
+            }
+            else
+            {
+                if (iter().isDict())
+                {
+                    const dictionary& fieldDict(iter().dict());
+                    fd.absTol = readScalar(fieldDict.lookup("tolerance"));
+                    fd.relTol = readScalar(fieldDict.lookup("relTol"));
+                }
+                else
+                {
+                    FatalErrorInFunction
+                        << "Residual data for " << iter().keyword()
+                        << " must be specified as a dictionary"
+                        << exit(FatalError);
+                }
+            }
+        }
+    }
+
+    residualControl_.transfer(data);
+
+    if (debug)
+    {
+        forAll(residualControl_, i)
+        {
+            const fieldData& fd = residualControl_[i];
+            Info<< "residualControl[" << i << "]:" << nl
+                << "    name     : " << fd.name << nl
+                << "    absTol   : " << fd.absTol << nl
+                << "    relTol   : " << fd.relTol << nl
+                << "    iniResid : " << fd.initialResidual << endl;
+        }
+    }
+}
+
+
+void Foam::solutionControl::read()
+{
+    read(false);
+}
+
+
+Foam::label Foam::solutionControl::applyToField
+(
+    const word& fieldName,
+    const bool useRegEx
+) const
+{
+    forAll(residualControl_, i)
+    {
+        if (useRegEx && residualControl_[i].name.match(fieldName))
+        {
+            return i;
+        }
+        else if (residualControl_[i].name == fieldName)
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+
+void Foam::solutionControl::storePrevIterFields() const
+{
+//    storePrevIter<label>();
+    storePrevIter<scalar>();
+    storePrevIter<vector>();
+    storePrevIter<sphericalTensor>();
+    storePrevIter<symmTensor>();
+    storePrevIter<tensor>();
+}
+
+
+template<class Type>
+void Foam::solutionControl::maxTypeResidual
+(
+    const word& fieldName,
+    ITstream& data,
+    scalar& firstRes,
+    scalar& lastRes
+) const
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+
+    if (mesh_.foundObject<fieldType>(fieldName))
+    {
+        const List<SolverPerformance<Type> > sp(data);
+        firstRes = cmptMax(sp.first().initialResidual());
+        lastRes = cmptMax(sp.last().initialResidual());
+    }
+}
+
+
+Foam::scalar Foam::solutionControl::maxResidual
+(
+    const word& fieldName,
+    ITstream& data,
+    scalar& lastRes
+) const
+{
+    scalar firstRes = 0;
+
+    maxTypeResidual<scalar>(fieldName, data, firstRes, lastRes);
+    maxTypeResidual<vector>(fieldName, data, firstRes, lastRes);
+    maxTypeResidual<sphericalTensor>(fieldName, data, firstRes, lastRes);
+    maxTypeResidual<symmTensor>(fieldName, data, firstRes, lastRes);
+    maxTypeResidual<tensor>(fieldName, data, firstRes, lastRes);
+
+    return firstRes;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::solutionControl::solutionControl(fvMesh& mesh, const word& algorithmName)
+:
+    IOobject
+    (
+        "solutionControl",
+        mesh.time().timeName(),
+        mesh
+    ),
+    mesh_(mesh),
+    residualControl_(),
+    algorithmName_(algorithmName),
+    nNonOrthCorr_(0),
+    momentumPredictor_(true),
+    transonic_(false),
+    consistent_(false),
+    corr_(0),
+    corrNonOrtho_(0)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::solutionControl::~solutionControl()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
new file mode 100644
index 000000000..5b5c6b4f4
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
@@ -0,0 +1,231 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::solutionControl
+
+Description
+    Base class for solution control classes
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef solutionControl_H
+#define solutionControl_H
+
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class solutionControl Declaration
+\*---------------------------------------------------------------------------*/
+
+class solutionControl
+:
+    public IOobject
+{
+public:
+
+    struct fieldData
+    {
+        wordRe name;
+        scalar absTol;
+        scalar relTol;
+        scalar initialResidual;
+    };
+
+
+protected:
+
+    // Protected data
+
+        //- Reference to the mesh database
+        fvMesh& mesh_;
+
+        //- List of residual data per field
+        List<fieldData> residualControl_;
+
+        //- The dictionary name, e.g. SIMPLE, PIMPLE
+        const word algorithmName_;
+
+
+        // Solution controls
+
+            //- Maximum number of non-orthogonal correctors
+            label nNonOrthCorr_;
+
+            //- Flag to indicate to solve for momentum
+            bool momentumPredictor_;
+
+            //- Flag to indicate to solve using transonic algorithm
+            bool transonic_;
+
+            //- Flag to indicate to relax pressure using the
+            //  "consistent" approach of SIMPLEC
+            bool consistent_;
+
+
+        // Evolution
+
+            //- Current corrector loop index
+            label corr_;
+
+            //- Current non-orthogonal corrector loop index
+            label corrNonOrtho_;
+
+
+    // Protected Member Functions
+
+        //- Read controls from fvSolution dictionary
+        virtual void read(const bool absTolOnly);
+
+        //- Read controls from fvSolution dictionary
+        virtual void read();
+
+        //- Return index of field in residualControl_ if present
+        virtual label applyToField
+        (
+            const word& fieldName,
+            const bool useRegEx = true
+        ) const;
+
+        //- Return true if all convergence checks are satisfied
+        virtual bool criteriaSatisfied() = 0;
+
+        //- Store previous iteration fields
+        virtual void storePrevIterFields() const;
+
+        //- Store previous iteration field for vol<Type>Fields
+        template<class Type>
+        void storePrevIter() const;
+
+        template<class Type>
+        void maxTypeResidual
+        (
+            const word& fieldName,
+            ITstream& data,
+            scalar& firstRes,
+            scalar& lastRes
+        ) const;
+
+        scalar maxResidual
+        (
+            const word& fieldName,
+            ITstream& data,
+            scalar& lastRes
+        ) const;
+
+
+private:
+
+        //- Disallow default bitwise copy construct
+        solutionControl(const solutionControl&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const solutionControl&);
+
+
+public:
+
+
+    // Static Data Members
+
+        //- Run-time type information
+        TypeName("solutionControl");
+
+
+    // Constructors
+
+        //- Construct from mesh
+        solutionControl(fvMesh& mesh, const word& algorithmName);
+
+
+    //- Destructor
+    virtual ~solutionControl();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return the solution dictionary
+            inline const dictionary& dict() const;
+
+            //- Current corrector loop index
+            inline label corr() const;
+
+            //- Current non-orthogonal corrector index
+            inline label corrNonOrtho() const;
+
+
+        // Solution control
+
+            //- Maximum number of non-orthogonal correctors
+            inline label nNonOrthCorr() const;
+
+            //- Helper function to identify final non-orthogonal iteration
+            inline bool finalNonOrthogonalIter() const;
+
+            //- Flag to indicate to solve for momentum
+            inline bool momentumPredictor() const;
+
+            //- Flag to indicate to solve using transonic algorithm
+            inline bool transonic() const;
+
+            //- Flag to indicate to relax pressure using the
+            //  "consistent" approach of SIMPLEC
+            inline bool consistent() const;
+
+
+        // Evolution
+
+            //- Main control loop
+            virtual bool loop() = 0;
+
+            //- Non-orthogonal corrector loop
+            inline bool correctNonOrthogonal();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "solutionControlTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "solutionControlI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlI.H b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlI.H
new file mode 100644
index 000000000..57b58f081
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlI.H
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline const Foam::dictionary& Foam::solutionControl::dict() const
+{
+    return mesh_.solutionDict().subDict(algorithmName_);
+}
+
+
+inline Foam::label Foam::solutionControl::corr() const
+{
+    return corr_;
+}
+
+
+inline Foam::label Foam::solutionControl::corrNonOrtho() const
+{
+    return corrNonOrtho_;
+}
+
+
+inline Foam::label Foam::solutionControl::nNonOrthCorr() const
+{
+    return nNonOrthCorr_;
+}
+
+
+inline bool Foam::solutionControl::finalNonOrthogonalIter() const
+{
+    return corrNonOrtho_ == nNonOrthCorr_ + 1;
+}
+
+
+inline bool Foam::solutionControl::momentumPredictor() const
+{
+    return momentumPredictor_;
+}
+
+
+inline bool Foam::solutionControl::transonic() const
+{
+    return transonic_;
+}
+
+
+inline bool Foam::solutionControl::consistent() const
+{
+    return consistent_;
+}
+
+
+inline bool Foam::solutionControl::correctNonOrthogonal()
+{
+    corrNonOrtho_++;
+
+    if (debug)
+    {
+        Info<< algorithmName_ << " correctNonOrthogonal: corrNonOrtho = "
+            << corrNonOrtho_ << endl;
+    }
+
+    if (corrNonOrtho_ <= nNonOrthCorr_ + 1)
+    {
+        return true;
+    }
+    else
+    {
+        corrNonOrtho_ = 0;
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlTemplates.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlTemplates.C
new file mode 100644
index 000000000..3d42cb28a
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlTemplates.C
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "GeometricField.H"
+#include "volMesh.H"
+#include "fvPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::solutionControl::storePrevIter() const
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> GeoField;
+
+    HashTable<GeoField*>
+        flds(mesh_.objectRegistry::lookupClass<GeoField>());
+
+    forAllIter(typename HashTable<GeoField*>, flds, iter)
+    {
+        GeoField& fld = *iter();
+
+        const word& fName = fld.name();
+
+        size_t prevIterField = fName.find("PrevIter");
+
+        if ((prevIterField == word::npos) && mesh_.relaxField(fName))
+        {
+            if (debug)
+            {
+                Info<< algorithmName_ << ": storing previous iter for "
+                    << fName << endl;
+            }
+
+            fld.storePrevIter();
+        }
+    }
+}
+
+
+// ************************************************************************* //

From 6fbeca5204e1a815eee8f183f3729957e3dfb180 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sat, 9 Apr 2016 23:27:23 +0200
Subject: [PATCH 04/55] Added data and SolverPerformance classes from vanilla
 3.0.1

---
 .../lduMatrix/lduMatrix/SolverPerformance.C   | 240 ++++++++++++++
 .../lduMatrix/lduMatrix/SolverPerformance.H   | 301 ++++++++++++++++++
 src/foam/meshes/data/data.C                   |  62 ++++
 src/foam/meshes/data/data.H                   | 124 ++++++++
 src/foam/meshes/data/dataTemplates.C          |  71 +++++
 5 files changed, 798 insertions(+)
 create mode 100644 src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.C
 create mode 100644 src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.H
 create mode 100644 src/foam/meshes/data/data.C
 create mode 100644 src/foam/meshes/data/data.H
 create mode 100644 src/foam/meshes/data/dataTemplates.C

diff --git a/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.C b/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.C
new file mode 100644
index 000000000..e898751fd
--- /dev/null
+++ b/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.C
@@ -0,0 +1,240 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM 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.
+
+    OpenFOAM 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 OpenFOAM.  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
new file mode 100644
index 000000000..c24fc9c79
--- /dev/null
+++ b/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.H
@@ -0,0 +1,301 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM 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.
+
+    OpenFOAM 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 OpenFOAM.  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/meshes/data/data.C b/src/foam/meshes/data/data.C
new file mode 100644
index 000000000..6ad811658
--- /dev/null
+++ b/src/foam/meshes/data/data.C
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM 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.
+
+    OpenFOAM 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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "data.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+int Foam::data::debug(Foam::debug::debugSwitch("data", false));
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::data::data(const objectRegistry& obr)
+:
+    IOdictionary
+    (
+        IOobject
+        (
+            "data",
+            obr.time().system(),
+            obr,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    prevTimeIndex_(0)
+{
+    set("solverPerformance", dictionary());
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::dictionary& Foam::data::solverPerformanceDict() const
+{
+    return subDict("solverPerformance");
+}
+
+
+// ************************************************************************* //
diff --git a/src/foam/meshes/data/data.H b/src/foam/meshes/data/data.H
new file mode 100644
index 000000000..c5b7758e9
--- /dev/null
+++ b/src/foam/meshes/data/data.H
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM 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.
+
+    OpenFOAM 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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::data
+
+Description
+    Database for solution data, solver performance and other reduced data.
+
+    fvMesh is derived from data so that all fields have access to the data from
+    the mesh reference they hold.
+
+SourceFiles
+    data.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef data_H
+#define data_H
+
+#include "IOdictionary.H"
+#include "solverPerformance.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                            Class data Declaration
+\*---------------------------------------------------------------------------*/
+
+class data
+:
+    public IOdictionary
+{
+    // Private data
+
+        //- Previously used time-index, used for reset between iterations
+        mutable label prevTimeIndex_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        data(const data&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const data&);
+
+
+public:
+
+    //- Debug switch
+    static int debug;
+
+
+    // Constructors
+
+        //- Construct for objectRegistry
+        data(const objectRegistry& obr);
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return the dictionary of solver performance data
+            //  which includes initial and final residuals for convergence
+            //  checking
+            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;
+
+            //- Add/set the solverPerformance entry, using its fieldName
+            template<class Type>
+            void setSolverPerformance
+            (
+                const SolverPerformance<Type>&
+            ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "dataTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/foam/meshes/data/dataTemplates.C b/src/foam/meshes/data/dataTemplates.C
new file mode 100644
index 000000000..8929ee123
--- /dev/null
+++ b/src/foam/meshes/data/dataTemplates.C
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM 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.
+
+    OpenFOAM 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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "data.H"
+#include "Time.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);
+}
+
+
+// ************************************************************************* //

From ed4345faf8f8ea75c0c34866ae75f4e3816483c8 Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Sat, 9 Apr 2016 23:33:55 +0200
Subject: [PATCH 05/55] Backport orthogonal snGrad scheme from vanilla 3.0.1

---
 src/finiteVolume/Make/files                   |   1 +
 .../orthogonalSnGrad/orthogonalSnGrad.C       |  76 ++++++++++
 .../orthogonalSnGrad/orthogonalSnGrad.H       | 133 ++++++++++++++++++
 .../orthogonalSnGrad/orthogonalSnGrads.C      |  42 ++++++
 .../icoFoam/cavity/system/fvSchemes           |   6 +-
 5 files changed, 254 insertions(+), 4 deletions(-)
 create mode 100644 src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
 create mode 100644 src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
 create mode 100644 src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrads.C

diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 3fb994320..4fff15bdd 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -365,6 +365,7 @@ $(snGradSchemes)/snGradScheme/snGradSchemes.C
 $(snGradSchemes)/correctedSnGrad/correctedSnGrads.C
 $(snGradSchemes)/limitedSnGrad/limitedSnGrads.C
 $(snGradSchemes)/uncorrectedSnGrad/uncorrectedSnGrads.C
+$(snGradSchemes)/orthogonalSnGrad/orthogonalSnGrads.C
 $(snGradSchemes)/skewCorrectedSnGrad/skewCorrectedSnGrads.C
 $(snGradSchemes)/fourthSnGrad/fourthSnGrads.C
 /*
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
new file mode 100644
index 000000000..39866b78a
--- /dev/null
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C
@@ -0,0 +1,76 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM 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.
+
+    OpenFOAM 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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Description
+    Simple central-difference snGrad scheme without non-orthogonal correction.
+
+\*---------------------------------------------------------------------------*/
+
+#include "orthogonalSnGrad.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace fv
+{
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+orthogonalSnGrad<Type>::~orthogonalSnGrad()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+orthogonalSnGrad<Type>::correction
+(
+    const GeometricField<Type, fvPatchField, volMesh>&
+) const
+{
+    notImplemented
+    (
+        "orthogonalSnGrad<Type>::correction"
+        "(const GeometricField<Type, fvPatchField, volMesh>&)"
+    );
+    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >(NULL);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fv
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
new file mode 100644
index 000000000..b90329816
--- /dev/null
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H
@@ -0,0 +1,133 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM 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.
+
+    OpenFOAM 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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fv::orthogonalSnGrad
+
+Description
+    Simple central-difference snGrad scheme without non-orthogonal correction.
+
+SourceFiles
+    orthogonalSnGrad.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef orthogonalSnGrad_H
+#define orthogonalSnGrad_H
+
+#include "snGradScheme.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace fv
+{
+
+/*---------------------------------------------------------------------------*\
+                 Class orthogonalSnGrad Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class orthogonalSnGrad
+:
+    public snGradScheme<Type>
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise assignment
+        void operator=(const orthogonalSnGrad&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("orthogonal");
+
+
+    // Constructors
+
+        //- Construct from mesh
+        orthogonalSnGrad(const fvMesh& mesh)
+        :
+            snGradScheme<Type>(mesh)
+        {}
+
+
+        //- Construct from mesh and data stream
+        orthogonalSnGrad(const fvMesh& mesh, Istream&)
+        :
+            snGradScheme<Type>(mesh)
+        {}
+
+
+    //- Destructor
+    virtual ~orthogonalSnGrad();
+
+
+    // Member Functions
+
+        //- Return the interpolation weighting factors for the given field
+        virtual tmp<surfaceScalarField> deltaCoeffs
+        (
+            const GeometricField<Type, fvPatchField, volMesh>&
+        ) const
+        {
+            return this->mesh().deltaCoeffs();
+        }
+
+        //- Return true if this scheme uses an explicit correction
+        virtual bool corrected() const
+        {
+            return false;
+        }
+
+        //- Return the explicit correction to the orthogonalSnGrad
+        //  for the given field
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fv
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "orthogonalSnGrad.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrads.C b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrads.C
new file mode 100644
index 000000000..f48bbffe4
--- /dev/null
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrads.C
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM 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.
+
+    OpenFOAM 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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Description
+    Simple central-difference snGrad scheme without non-orthogonal correction.
+
+\*---------------------------------------------------------------------------*/
+
+#include "orthogonalSnGrad.H"
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace fv
+{
+    makeSnGradScheme(orthogonalSnGrad)
+}
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavity/system/fvSchemes b/tutorials/incompressible/icoFoam/cavity/system/fvSchemes
index e807e470c..f2da7785f 100644
--- a/tutorials/incompressible/icoFoam/cavity/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavity/system/fvSchemes
@@ -33,9 +33,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(nu,U) Gauss linear corrected;
-    laplacian((1|A(U)),p) Gauss linear corrected;
+    default         Gauss linear orthogonal;
 }
 
 interpolationSchemes
@@ -46,7 +44,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         corrected;
+    default         orthogonal;
 }
 
 // ************************************************************************* //

From c90a1d95699ae743c36df164d602a0e14a13b2ce Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sat, 9 Apr 2016 23:37:40 +0200
Subject: [PATCH 06/55] Changed headers and added solverPerformance type from
 vanilla 3.0.1

---
 src/foam/Make/files                           |  2 +
 .../lduMatrix/lduMatrix/SolverPerformance.C   | 28 +++++-----
 .../lduMatrix/lduMatrix/SolverPerformance.H   | 28 +++++-----
 .../matrices/lduMatrix/lduMatrix/lduMatrix.H  |  1 +
 .../lduMatrix/lduMatrix/solverPerformance.C   | 47 ++++++++++++++++
 .../lduMatrix/lduMatrix/solverPerformance.H   | 56 +++++++++++++++++++
 src/foam/meshes/data/data.C                   | 28 +++++-----
 src/foam/meshes/data/data.H                   | 28 +++++-----
 src/foam/meshes/data/dataTemplates.C          | 28 +++++-----
 9 files changed, 176 insertions(+), 70 deletions(-)
 create mode 100644 src/foam/matrices/lduMatrix/lduMatrix/solverPerformance.C
 create mode 100644 src/foam/matrices/lduMatrix/lduMatrix/solverPerformance.H

diff --git a/src/foam/Make/files b/src/foam/Make/files
index 012816086..8b7d803b4 100644
--- a/src/foam/Make/files
+++ b/src/foam/Make/files
@@ -637,6 +637,8 @@ $(writers)/gnuplotGraph/gnuplotGraph.C
 $(writers)/xmgrGraph/xmgrGraph.C
 $(writers)/jplotGraph/jplotGraph.C
 
+meshes/data/data.C
+
 primitives/BlockCoeff/blockCoeffBase.C
 primitives/BlockCoeff/scalarBlockCoeff.C
 primitives/BlockCoeff/sphericalTensorBlockCoeff.C
diff --git a/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.C b/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.C
index e898751fd..90136bed7 100644
--- a/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.C
+++ b/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.C
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+  \\      /  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 OpenFOAM.
+    This file is part of foam-extend.
 
-    OpenFOAM 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 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.
 
-    OpenFOAM 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.
+    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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.H b/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.H
index c24fc9c79..7190834ac 100644
--- a/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.H
+++ b/src/foam/matrices/lduMatrix/lduMatrix/SolverPerformance.H
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+  \\      /  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 OpenFOAM.
+    This file is part of foam-extend.
 
-    OpenFOAM 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 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.
 
-    OpenFOAM 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.
+    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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::SolverPerformance
diff --git a/src/foam/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/foam/matrices/lduMatrix/lduMatrix/lduMatrix.H
index 64054d161..e20fb81a7 100644
--- a/src/foam/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/foam/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -56,6 +56,7 @@ SourceFiles
 #include "primitiveFieldsFwd.H"
 #include "FieldField.H"
 #include "lduInterfaceFieldPtrsList.H"
+#include "SolverPerformance.H"
 #include "typeInfo.H"
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
diff --git a/src/foam/matrices/lduMatrix/lduMatrix/solverPerformance.C b/src/foam/matrices/lduMatrix/lduMatrix/solverPerformance.C
new file mode 100644
index 000000000..49e125d11
--- /dev/null
+++ b/src/foam/matrices/lduMatrix/lduMatrix/solverPerformance.C
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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
new file mode 100644
index 000000000..3bb5256a1
--- /dev/null
+++ b/src/foam/matrices/lduMatrix/lduMatrix/solverPerformance.H
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/meshes/data/data.C b/src/foam/meshes/data/data.C
index 6ad811658..3b38d59d4 100644
--- a/src/foam/meshes/data/data.C
+++ b/src/foam/meshes/data/data.C
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+  \\      /  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 OpenFOAM.
+    This file is part of foam-extend.
 
-    OpenFOAM 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 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.
 
-    OpenFOAM 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.
+    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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/foam/meshes/data/data.H b/src/foam/meshes/data/data.H
index c5b7758e9..1489935c5 100644
--- a/src/foam/meshes/data/data.H
+++ b/src/foam/meshes/data/data.H
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+  \\      /  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 OpenFOAM.
+    This file is part of foam-extend.
 
-    OpenFOAM 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 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.
 
-    OpenFOAM 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.
+    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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::data
diff --git a/src/foam/meshes/data/dataTemplates.C b/src/foam/meshes/data/dataTemplates.C
index 8929ee123..6c3a9ac1c 100644
--- a/src/foam/meshes/data/dataTemplates.C
+++ b/src/foam/meshes/data/dataTemplates.C
@@ -1,25 +1,25 @@
 /*---------------------------------------------------------------------------*\
   =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+  \\      /  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 OpenFOAM.
+    This file is part of foam-extend.
 
-    OpenFOAM 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 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.
 
-    OpenFOAM 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.
+    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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 

From c2886e89e51fae705bc98915522287df78006f6a Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sat, 9 Apr 2016 23:57:26 +0200
Subject: [PATCH 07/55] Fixed data.C and dataTemplates.C

---
 src/foam/meshes/data/data.C          | 4 ++--
 src/foam/meshes/data/dataTemplates.C | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/foam/meshes/data/data.C b/src/foam/meshes/data/data.C
index 3b38d59d4..97613d3d2 100644
--- a/src/foam/meshes/data/data.C
+++ b/src/foam/meshes/data/data.C
@@ -24,11 +24,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "data.H"
-#include "Time.H"
+#include "foamTime.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-int Foam::data::debug(Foam::debug::debugSwitch("data", false));
+int Foam::data::debug(Foam::debug::debugSwitchFromDict("data", false));
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/foam/meshes/data/dataTemplates.C b/src/foam/meshes/data/dataTemplates.C
index 6c3a9ac1c..19da28227 100644
--- a/src/foam/meshes/data/dataTemplates.C
+++ b/src/foam/meshes/data/dataTemplates.C
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "data.H"
-#include "Time.H"
+#include "foamTime.H"
 #include "solverPerformance.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

From 11d0c32d20317cc6708dae91f675bc784c976086 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Tue, 12 Apr 2016 09:05:00 +0200
Subject: [PATCH 08/55] solutionControl classes are now compiling

---
 .../solutionControl/simpleControl/simpleControl.C  |  2 +-
 .../solutionControl/solutionControl.C              | 14 ++++++++++----
 .../solutionControl/solutionControl.H              | 12 ++++++++----
 .../solutionControl/solutionControlTemplates.C     |  8 ++++----
 src/finiteVolume/fvMesh/fvMesh.C                   |  4 ++++
 src/finiteVolume/fvMesh/fvMesh.H                   |  4 +++-
 .../GeometricField/GeometricField.C                |  1 +
 7 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
index c7bced189..c88c39037 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "simpleControl.H"
-#include "Time.H"
+#include "foamTime.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
index 82ba01670..b0d36cc3f 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
@@ -81,8 +81,11 @@ void Foam::solutionControl::read(const bool absTolOnly)
                 }
                 else
                 {
-                    FatalErrorInFunction
-                        << "Residual data for " << iter().keyword()
+                    FatalErrorIn
+                    (
+                        "void Foam::solutionControl::read"
+                        "(const bool absTolOnly)"
+                    )   << "Residual data for " << iter().keyword()
                         << " must be specified as a dictionary"
                         << exit(FatalError);
                 }
@@ -107,8 +110,11 @@ void Foam::solutionControl::read(const bool absTolOnly)
                 }
                 else
                 {
-                    FatalErrorInFunction
-                        << "Residual data for " << iter().keyword()
+                    FatalErrorIn
+                    (
+                        "void Foam::solutionControl::read"
+                        "(const bool absTolOnly)"
+                    )   << "Residual data for " << iter().keyword()
                         << " must be specified as a dictionary"
                         << exit(FatalError);
                 }
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
index 5b5c6b4f4..f202e86e6 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
@@ -33,6 +33,10 @@ Description
 #define solutionControl_H
 
 #include "fvMesh.H"
+#include "surfaceMesh.H"
+#include "fvsPatchField.H"
+#include "fvMatrices.H"
+#include "wordRe.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -216,16 +220,16 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "solutionControlI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #ifdef NoRepository
     #include "solutionControlTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "solutionControlI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlTemplates.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlTemplates.C
index 3d42cb28a..011c8af5f 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlTemplates.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlTemplates.C
@@ -34,18 +34,18 @@ void Foam::solutionControl::storePrevIter() const
 {
     typedef GeometricField<Type, fvPatchField, volMesh> GeoField;
 
-    HashTable<GeoField*>
+    HashTable<const GeoField*>
         flds(mesh_.objectRegistry::lookupClass<GeoField>());
 
-    forAllIter(typename HashTable<GeoField*>, flds, iter)
+    forAllIter(typename HashTable<const GeoField*>, flds, iter)
     {
-        GeoField& fld = *iter();
+        const GeoField& fld = *iter();
 
         const word& fName = fld.name();
 
         size_t prevIterField = fName.find("PrevIter");
 
-        if ((prevIterField == word::npos) && mesh_.relaxField(fName))
+        if ((prevIterField == word::npos) && mesh_.solutionDict().relax(fName))
         {
             if (debug)
             {
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index c422c8128..75568127d 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -103,6 +103,7 @@ Foam::fvMesh::fvMesh(const IOobject& io)
 :
     polyMesh(io),
     surfaceInterpolation(*this),
+    data(static_cast<const objectRegistry&>(*this)),
     boundary_(*this, boundaryMesh()),
     lduPtr_(NULL),
     curTimeIndex_(time().timeIndex()),
@@ -205,6 +206,7 @@ Foam::fvMesh::fvMesh
 :
     polyMesh(io, points, faces, allOwner, allNeighbour, syncPar),
     surfaceInterpolation(*this),
+    data(static_cast<const objectRegistry&>(*this)),
     boundary_(*this),
     lduPtr_(NULL),
     curTimeIndex_(time().timeIndex()),
@@ -235,6 +237,7 @@ Foam::fvMesh::fvMesh
 :
     polyMesh(io, points, faces, cells, syncPar),
     surfaceInterpolation(*this),
+    data(static_cast<const objectRegistry&>(*this)),
     boundary_(*this),
     lduPtr_(NULL),
     curTimeIndex_(time().timeIndex()),
@@ -282,6 +285,7 @@ Foam::fvMesh::fvMesh
         syncPar
     ),
     surfaceInterpolation(*this),
+    data(static_cast<const objectRegistry&>(*this)),
     boundary_(*this),
     lduPtr_(NULL),
     curTimeIndex_(time().timeIndex()),
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 3bb3a115f..ed3d8a7b0 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -52,6 +52,7 @@ SourceFiles
 #include "primitiveMesh.H"
 #include "fvBoundaryMesh.H"
 #include "surfaceInterpolation.H"
+#include "data.H"
 #include "DimensionedField.H"
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
@@ -76,7 +77,8 @@ class fvMesh
 :
     public polyMesh,
     public lduMesh,
-    public surfaceInterpolation
+    public surfaceInterpolation,
+    public data
 {
     // Private data
 
diff --git a/src/foam/fields/GeometricFields/GeometricField/GeometricField.C b/src/foam/fields/GeometricFields/GeometricField/GeometricField.C
index b554fd71c..6936a664c 100644
--- a/src/foam/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/foam/fields/GeometricFields/GeometricField/GeometricField.C
@@ -27,6 +27,7 @@ License
 #include "foamTime.H"
 #include "demandDrivenData.H"
 #include "dictionary.H"
+#include "data.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From 0927054bd92789a3137c2976811488e020fc36d0 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Tue, 12 Apr 2016 09:07:01 +0200
Subject: [PATCH 09/55] Removed fvOptions.H from pisoFoam

---
 applications/solvers/incompressible/pisoFoam/pisoFoam.C | 1 -
 1 file changed, 1 deletion(-)

diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index 67f634291..502df6b3b 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -35,7 +35,6 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "turbulenceModel.H"
 #include "pisoControl.H"
-#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From 41ea052e7a9cb02df5d3f6cb72bdb6b5b3395883 Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Tue, 12 Apr 2016 09:31:33 +0200
Subject: [PATCH 10/55] Fixing compilation

---
 applications/solvers/basic/potentialDyMFoam/correctPhi.H        | 2 +-
 applications/solvers/engine/icoDyMEngineFoam/correctPhi.H       | 2 +-
 applications/solvers/engine/turbDyMEngineFoam/correctPhi.H      | 2 +-
 applications/solvers/immersedBoundary/interIbFoam/correctPhi.H  | 2 +-
 applications/solvers/incompressible/icoDyMFoam/correctPhi.H     | 2 +-
 .../solvers/incompressible/icoDyMSimpleFoam/correctPhi.H        | 2 +-
 applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H  | 2 +-
 .../solvers/multiphase/compressibleInterDyMFoam/correctPhi.H    | 2 +-
 applications/solvers/multiphase/interDyMFoam/correctPhi.H       | 2 +-
 applications/solvers/multiphase/interFoam/correctPhi.H          | 2 +-
 .../solvers/multiphase/interPhaseChangeFoam/correctPhi.H        | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/applications/solvers/basic/potentialDyMFoam/correctPhi.H b/applications/solvers/basic/potentialDyMFoam/correctPhi.H
index 6c78a0960..ba21e24cc 100644
--- a/applications/solvers/basic/potentialDyMFoam/correctPhi.H
+++ b/applications/solvers/basic/potentialDyMFoam/correctPhi.H
@@ -34,7 +34,7 @@
         fvc::makeAbsolute(phi, U);
     }
 
-    mesh.setFluxRequired(pcorr.name());
+    mesh.schemesDict().setFluxRequired(pcorr.name());
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
diff --git a/applications/solvers/engine/icoDyMEngineFoam/correctPhi.H b/applications/solvers/engine/icoDyMEngineFoam/correctPhi.H
index 15ce43ec7..5a8dc6a33 100644
--- a/applications/solvers/engine/icoDyMEngineFoam/correctPhi.H
+++ b/applications/solvers/engine/icoDyMEngineFoam/correctPhi.H
@@ -26,7 +26,7 @@
 
     phi = fvc::interpolate(U) & mesh.Sf();
 
-    mesh.setFluxRequired(pcorr.name());
+    mesh.schemesDict().setFluxRequired(pcorr.name());
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
diff --git a/applications/solvers/engine/turbDyMEngineFoam/correctPhi.H b/applications/solvers/engine/turbDyMEngineFoam/correctPhi.H
index 15ce43ec7..5a8dc6a33 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/correctPhi.H
+++ b/applications/solvers/engine/turbDyMEngineFoam/correctPhi.H
@@ -26,7 +26,7 @@
 
     phi = fvc::interpolate(U) & mesh.Sf();
 
-    mesh.setFluxRequired(pcorr.name());
+    mesh.schemesDict().setFluxRequired(pcorr.name());
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
diff --git a/applications/solvers/immersedBoundary/interIbFoam/correctPhi.H b/applications/solvers/immersedBoundary/interIbFoam/correctPhi.H
index 9945bf708..bce66493e 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/correctPhi.H
+++ b/applications/solvers/immersedBoundary/interIbFoam/correctPhi.H
@@ -36,7 +36,7 @@
     immersedBoundaryAdjustPhi(phi, U);
     adjustPhi(phi, U, pcorr);
 
-    mesh.setFluxRequired(pcorr.name());
+    mesh.schemesDict().setFluxRequired(pcorr.name());
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
diff --git a/applications/solvers/incompressible/icoDyMFoam/correctPhi.H b/applications/solvers/incompressible/icoDyMFoam/correctPhi.H
index 6c78a0960..ba21e24cc 100644
--- a/applications/solvers/incompressible/icoDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/icoDyMFoam/correctPhi.H
@@ -34,7 +34,7 @@
         fvc::makeAbsolute(phi, U);
     }
 
-    mesh.setFluxRequired(pcorr.name());
+    mesh.schemesDict().setFluxRequired(pcorr.name());
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H b/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H
index 3f9a190d4..2cb0bff0a 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H
@@ -24,7 +24,7 @@
         pcorrTypes
     );
 
-    mesh.setFluxRequired(pcorr.name());
+    mesh.schemesDict().setFluxRequired(pcorr.name());
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H b/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
index 27d7c9113..aa99200c4 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
@@ -35,7 +35,7 @@
 
     adjustPhi(phi, U, pcorr);
 
-    mesh.setFluxRequired(pcorr.name());
+    mesh.schemesDict().setFluxRequired(pcorr.name());
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H
index dd3ddc486..5a114050d 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H
@@ -42,7 +42,7 @@
 
     adjustPhi(phi, U, pcorr);
 
-    mesh.setFluxRequired(pcorr.name());
+    mesh.schemesDict().setFluxRequired(pcorr.name());
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
diff --git a/applications/solvers/multiphase/interDyMFoam/correctPhi.H b/applications/solvers/multiphase/interDyMFoam/correctPhi.H
index 33f3f08a6..78a616422 100644
--- a/applications/solvers/multiphase/interDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interDyMFoam/correctPhi.H
@@ -27,7 +27,7 @@
 
     adjustPhi(phi, U, pcorr);
 
-    mesh.setFluxRequired(pcorr.name());
+    mesh.schemesDict().setFluxRequired(pcorr.name());
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
diff --git a/applications/solvers/multiphase/interFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/correctPhi.H
index f8988a54c..a1cb1bf0a 100644
--- a/applications/solvers/multiphase/interFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/correctPhi.H
@@ -34,7 +34,7 @@
 
     adjustPhi(phi, U, pcorr);
 
-    mesh.setFluxRequired(pcorr.name());
+    mesh.schemesDict().setFluxRequired(pcorr.name());
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H b/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
index f8988a54c..a1cb1bf0a 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
@@ -34,7 +34,7 @@
 
     adjustPhi(phi, U, pcorr);
 
-    mesh.setFluxRequired(pcorr.name());
+    mesh.schemesDict().setFluxRequired(pcorr.name());
 
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {

From c02b6c17500a9d86d74a622d228e4ef31ce4b38d Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Tue, 12 Apr 2016 10:28:59 +0200
Subject: [PATCH 11/55] Modified icoFoam, icoDyMFoam and icoDyMSimpleFoam to
 use solutionControl (vanilla 3.0.1)

---
 .../incompressible/icoDyMFoam/correctPhi.H    |  4 ++--
 .../incompressible/icoDyMFoam/createFields.H  |  9 +-------
 .../incompressible/icoDyMFoam/icoDyMFoam.C    | 13 +++++++----
 .../incompressible/icoDyMFoam/readControls.H  | 19 +++++++--------
 .../icoDyMSimpleFoam/correctPhi.H             |  4 ++--
 .../icoDyMSimpleFoam/createFields.H           |  9 +-------
 .../icoDyMSimpleFoam/icoDyMSimpleFoam.C       | 17 +++++++-------
 .../icoDyMSimpleFoam/readControls.H           | 19 +++++++--------
 .../solvers/incompressible/icoFoam/icoFoam.C  | 23 ++++++++++++++-----
 9 files changed, 57 insertions(+), 60 deletions(-)

diff --git a/applications/solvers/incompressible/icoDyMFoam/correctPhi.H b/applications/solvers/incompressible/icoDyMFoam/correctPhi.H
index 6c78a0960..d29b9e726 100644
--- a/applications/solvers/incompressible/icoDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/icoDyMFoam/correctPhi.H
@@ -36,7 +36,7 @@
 
     mesh.setFluxRequired(pcorr.name());
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (piso.correctNonOrthogonal())
     {
         fvScalarMatrix pcorrEqn
         (
@@ -46,7 +46,7 @@
         pcorrEqn.setReference(pRefCell, pRefValue);
         pcorrEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (piso.finalNonOrthogonalIter())
         {
             phi -= pcorrEqn.flux();
         }
diff --git a/applications/solvers/incompressible/icoDyMFoam/createFields.H b/applications/solvers/incompressible/icoDyMFoam/createFields.H
index 9c918b565..d4d011004 100644
--- a/applications/solvers/incompressible/icoDyMFoam/createFields.H
+++ b/applications/solvers/incompressible/icoDyMFoam/createFields.H
@@ -71,16 +71,9 @@
         zeroGradientFvPatchScalarField::typeName
     );
 
+    bool momentumPredictor = piso.momentumPredictor();
 
     {
-        const dictionary& piso = mesh.solutionDict().subDict("PISO");
-
-        bool momentumPredictor = true;
-        if (piso.found("momentumPredictor"))
-        {
-            momentumPredictor = Switch(piso.lookup("momentumPredictor"));
-        }
-
         bool momentumPredictorSave = momentumPredictor;
         momentumPredictor = false;
 #       include "UEqn.H"
diff --git a/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C b/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C
index 84259e4eb..2bd63eb2a 100644
--- a/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C
+++ b/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C
@@ -35,6 +35,7 @@ Author
 
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,6 +44,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createDynamicFvMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "initContinuityErrs.H"
 #   include "initTotalVolume.H"
 #   include "createFields.H"
@@ -90,7 +94,7 @@ int main(int argc, char *argv[])
 
         // --- PISO loop
 
-        for (int corr = 0; corr < nCorr; corr++)
+        while (piso.correct())
         {
             rAU = 1.0/UEqn.A();
 
@@ -100,7 +104,8 @@ int main(int argc, char *argv[])
 
             adjustPhi(phi, U, p);
 
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            // Non-orthogonal pressure corrector loop
+            while (piso.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
@@ -109,7 +114,7 @@ int main(int argc, char *argv[])
 
                 pEqn.setReference(pRefCell, pRefValue);
 
-                if (corr == nCorr - 1 && nonOrth == nNonOrthCorr)
+                if (piso.finalInnerIter())
                 {
                     pEqn.solve(mesh.solutionDict().solver(p.name() + "Final"));
                 }
@@ -118,7 +123,7 @@ int main(int argc, char *argv[])
                     pEqn.solve(mesh.solutionDict().solver(p.name()));
                 }
 
-                if (nonOrth == nNonOrthCorr)
+                if (piso.finalNonOrthogonalIter())
                 {
                     phi -= pEqn.flux();
                 }
diff --git a/applications/solvers/incompressible/icoDyMFoam/readControls.H b/applications/solvers/incompressible/icoDyMFoam/readControls.H
index 9336616a1..a6b4cce58 100644
--- a/applications/solvers/incompressible/icoDyMFoam/readControls.H
+++ b/applications/solvers/incompressible/icoDyMFoam/readControls.H
@@ -1,14 +1,11 @@
 #   include "readTimeControls.H"
-#   include "readPISOControls.H"
 
-    bool correctPhi = false;
-    if (piso.found("correctPhi"))
-    {
-        correctPhi = Switch(piso.lookup("correctPhi"));
-    }
+    bool correctPhi
+    (
+        piso.dict().lookupOrDefault("correctPhi", false)
+    );
 
-    bool checkMeshCourantNo = false;
-    if (piso.found("checkMeshCourantNo"))
-    {
-        checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
-    }
+    bool checkMeshCourantNo
+    (
+        piso.dict().lookupOrDefault("checkMeshCourantNo", false)
+    );
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H b/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H
index 3f9a190d4..eb9730b95 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/correctPhi.H
@@ -26,7 +26,7 @@
 
     mesh.setFluxRequired(pcorr.name());
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (piso.correctNonOrthogonal())
     {
         fvScalarMatrix pcorrEqn
         (
@@ -36,7 +36,7 @@
         pcorrEqn.setReference(pRefCell, pRefValue);
         pcorrEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (piso.finalNonOrthogonalIter())
         {
             phi -= pcorrEqn.flux();
         }
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H b/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H
index 9c918b565..d4d011004 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H
@@ -71,16 +71,9 @@
         zeroGradientFvPatchScalarField::typeName
     );
 
+    bool momentumPredictor = piso.momentumPredictor();
 
     {
-        const dictionary& piso = mesh.solutionDict().subDict("PISO");
-
-        bool momentumPredictor = true;
-        if (piso.found("momentumPredictor"))
-        {
-            momentumPredictor = Switch(piso.lookup("momentumPredictor"));
-        }
-
         bool momentumPredictorSave = momentumPredictor;
         momentumPredictor = false;
 #       include "UEqn.H"
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C b/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
index b29c58ad9..bd86b5208 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
@@ -36,6 +36,7 @@ Author
 
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,6 +45,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createDynamicFvMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "initContinuityErrs.H"
 #   include "initTotalVolume.H"
 #   include "createFields.H"
@@ -89,7 +93,7 @@ int main(int argc, char *argv[])
 
         // --- SIMPLE loop
 
-        for (int ocorr = 0; ocorr < nOuterCorr; ocorr++)
+        while (piso.correct())
         {
 #           include "CourantNo.H"
 
@@ -105,7 +109,8 @@ int main(int argc, char *argv[])
 
             p.storePrevIter();
 
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            // Non-orthogonal pressure corrector loop
+            while (piso.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
@@ -114,11 +119,7 @@ int main(int argc, char *argv[])
 
                 pEqn.setReference(pRefCell, pRefValue);
 
-                if
-                (
-                    ocorr == nOuterCorr - 1
-                 && nonOrth == nNonOrthCorr
-                )
+                if(piso.finalInnerIter())
                 {
                     pEqn.solve(mesh.solutionDict().solver(p.name() + "Final"));
                 }
@@ -127,7 +128,7 @@ int main(int argc, char *argv[])
                     pEqn.solve(mesh.solutionDict().solver(p.name()));
                 }
 
-                if (nonOrth == nNonOrthCorr)
+                if (piso.finalNonOrthogonalIter())
                 {
                     phi -= pEqn.flux();
                 }
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/readControls.H b/applications/solvers/incompressible/icoDyMSimpleFoam/readControls.H
index 9336616a1..a6b4cce58 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/readControls.H
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/readControls.H
@@ -1,14 +1,11 @@
 #   include "readTimeControls.H"
-#   include "readPISOControls.H"
 
-    bool correctPhi = false;
-    if (piso.found("correctPhi"))
-    {
-        correctPhi = Switch(piso.lookup("correctPhi"));
-    }
+    bool correctPhi
+    (
+        piso.dict().lookupOrDefault("correctPhi", false)
+    );
 
-    bool checkMeshCourantNo = false;
-    if (piso.found("checkMeshCourantNo"))
-    {
-        checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
-    }
+    bool checkMeshCourantNo
+    (
+        piso.dict().lookupOrDefault("checkMeshCourantNo", false)
+    );
diff --git a/applications/solvers/incompressible/icoFoam/icoFoam.C b/applications/solvers/incompressible/icoFoam/icoFoam.C
index 164f5f6e9..c7efa80cf 100644
--- a/applications/solvers/incompressible/icoFoam/icoFoam.C
+++ b/applications/solvers/incompressible/icoFoam/icoFoam.C
@@ -30,6 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,6 +40,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 
@@ -50,7 +54,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPISOControls.H"
 #       include "CourantNo.H"
 
         fvVectorMatrix UEqn
@@ -63,8 +66,7 @@ int main(int argc, char *argv[])
         solve(UEqn == -fvc::grad(p));
 
         // --- PISO loop
-
-        for (int corr = 0; corr < nCorr; corr++)
+        while (piso.correct())
         {
             volScalarField rUA = 1.0/UEqn.A();
 
@@ -74,7 +76,8 @@ int main(int argc, char *argv[])
 
             adjustPhi(phi, U, p);
 
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            // Non-orthogonal pressure corrector loop
+            while (piso.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
@@ -82,9 +85,17 @@ int main(int argc, char *argv[])
                 );
 
                 pEqn.setReference(pRefCell, pRefValue);
-                pEqn.solve();
+                    
+                if (piso.finalInnerIter())
+                {
+                    pEqn.solve(mesh.solutionDict().solver("pFinal"));
+                }
+                else
+                {
+                    pEqn.solve();
+                }
 
-                if (nonOrth == nNonOrthCorr)
+                if (piso.finalNonOrthogonalIter())
                 {
                     phi -= pEqn.flux();
                 }

From aebf591aef13d0fdc48890ede5e08d6ec02bc63d Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Tue, 12 Apr 2016 11:31:20 +0200
Subject: [PATCH 12/55] Modified icoDyMEngineFoam, icoDyMIbFoam and icoIbFoam
 to use solutionControl (vanilla 3.0.1)

---
 .../engine/icoDyMEngineFoam/correctPhi.H        |  4 ++--
 .../engine/icoDyMEngineFoam/createFields.H      |  9 +--------
 .../engine/icoDyMEngineFoam/icoDyMEngineFoam.C  | 13 +++++++++----
 .../engine/icoDyMEngineFoam/readControls.H      | 10 ++++------
 .../icoDyMIbFoam/icoDyMIbFoam.C                 | 17 ++++++++++-------
 .../immersedBoundary/icoIbFoam/icoIbFoam.C      | 17 ++++++++++-------
 6 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/applications/solvers/engine/icoDyMEngineFoam/correctPhi.H b/applications/solvers/engine/icoDyMEngineFoam/correctPhi.H
index 5a8dc6a33..42cac00cf 100644
--- a/applications/solvers/engine/icoDyMEngineFoam/correctPhi.H
+++ b/applications/solvers/engine/icoDyMEngineFoam/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/icoDyMEngineFoam/createFields.H b/applications/solvers/engine/icoDyMEngineFoam/createFields.H
index 52faaaaa0..2665626f3 100644
--- a/applications/solvers/engine/icoDyMEngineFoam/createFields.H
+++ b/applications/solvers/engine/icoDyMEngineFoam/createFields.H
@@ -69,16 +69,9 @@
         zeroGradientFvPatchScalarField::typeName
     );
 
+    bool momentumPredictor = piso.momentumPredictor();
 
     {
-        const dictionary& piso = mesh.solutionDict().subDict("PISO");
-
-        bool momentumPredictor = true;
-        if (piso.found("momentumPredictor"))
-        {
-            momentumPredictor = Switch(piso.lookup("momentumPredictor"));
-        }
-
         bool momentumPredictorSave = momentumPredictor;
         momentumPredictor = false;
 #       include "UEqn.H"
diff --git a/applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C b/applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C
index ee685f5f4..e46417e14 100644
--- a/applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C
+++ b/applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C
@@ -36,6 +36,7 @@ Author
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "engineTime.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,6 +46,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createEngineTime.H"
 #   include "createDynamicFvMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
 
@@ -89,7 +93,7 @@ int main(int argc, char *argv[])
 
         // --- PISO loop
 
-        for (int corr = 0; corr < nCorr; corr++)
+        while (piso.correct())
         {
             rUA = 1.0/UEqn.A();
 
@@ -99,7 +103,8 @@ int main(int argc, char *argv[])
 
             adjustPhi(phi, U, p);
 
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            // Non-orthogonal pressure corrector loop
+            while (piso.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
@@ -108,7 +113,7 @@ int main(int argc, char *argv[])
 
                 pEqn.setReference(pRefCell, pRefValue);
 
-                if (corr == nCorr - 1 && nonOrth == nNonOrthCorr)
+                if (piso.finalInnerIter())
                 {
                     pEqn.solve(mesh.solutionDict().solver(p.name() + "Final"));
                 }
@@ -117,7 +122,7 @@ int main(int argc, char *argv[])
                     pEqn.solve(mesh.solutionDict().solver(p.name()));
                 }
 
-                if (nonOrth == nNonOrthCorr)
+                if (piso.finalNonOrthogonalIter())
                 {
                     phi -= pEqn.flux();
                 }
diff --git a/applications/solvers/engine/icoDyMEngineFoam/readControls.H b/applications/solvers/engine/icoDyMEngineFoam/readControls.H
index e4ade2696..95c6c4098 100644
--- a/applications/solvers/engine/icoDyMEngineFoam/readControls.H
+++ b/applications/solvers/engine/icoDyMEngineFoam/readControls.H
@@ -1,8 +1,6 @@
 #   include "readTimeControls.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/immersedBoundary/icoDyMIbFoam/icoDyMIbFoam.C b/applications/solvers/immersedBoundary/icoDyMIbFoam/icoDyMIbFoam.C
index ec8742d4b..20b187a0b 100644
--- a/applications/solvers/immersedBoundary/icoDyMIbFoam/icoDyMIbFoam.C
+++ b/applications/solvers/immersedBoundary/icoDyMIbFoam/icoDyMIbFoam.C
@@ -38,6 +38,7 @@ Author
 #include "dynamicFvMesh.H"
 #include "immersedBoundaryFvPatch.H"
 #include "immersedBoundaryAdjustPhi.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,6 +47,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"
 
@@ -68,12 +72,10 @@ int main(int argc, char *argv[])
         // Make the fluxes relative to the mesh motion
         fvc::makeRelative(phi, U);
 
-#       include "readPIMPLEControls.H"
 #       include "CourantNo.H"
 
         // Pressure-velocity corrector
-        int oCorr = 0;
-        do
+        while (pimple.loop())
         {
             fvVectorMatrix UEqn
             (
@@ -85,7 +87,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 rUA = 1.0/UEqn.A();
 
@@ -99,7 +101,8 @@ int main(int argc, char *argv[])
                 immersedBoundaryAdjustPhi(phi, U);
                 adjustPhi(phi, U, p);
 
-                for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+                // Non-orthogonal pressure corrector loop
+                while (pimple.correctNonOrthogonal())
                 {
                     fvScalarMatrix pEqn
                     (
@@ -109,7 +112,7 @@ int main(int argc, char *argv[])
                     pEqn.setReference(pRefCell, pRefValue);
                     pEqn.solve();
 
-                    if (nonOrth == nNonOrthCorr)
+                    if (pimple.finalNonOrthogonalIter())
                     {
                         phi -= pEqn.flux();
                     }
@@ -123,7 +126,7 @@ int main(int argc, char *argv[])
                 U -= rUA*fvc::grad(p);
                 U.correctBoundaryConditions();
             }
-        } while (++oCorr < nOuterCorr);
+        }
 
         runTime.write();
 
diff --git a/applications/solvers/immersedBoundary/icoIbFoam/icoIbFoam.C b/applications/solvers/immersedBoundary/icoIbFoam/icoIbFoam.C
index 7bc4f7589..4d3c9ce33 100644
--- a/applications/solvers/immersedBoundary/icoIbFoam/icoIbFoam.C
+++ b/applications/solvers/immersedBoundary/icoIbFoam/icoIbFoam.C
@@ -36,6 +36,7 @@ Author
 #include "fvCFD.H"
 #include "immersedBoundaryFvPatch.H"
 #include "immersedBoundaryAdjustPhi.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,6 +46,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "createIbMasks.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
@@ -57,12 +61,10 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPIMPLEControls.H"
 #       include "CourantNo.H"
 
         // Pressure-velocity corrector
-        int oCorr = 0;
-        do
+        while (pimple.loop())
         {
             fvVectorMatrix UEqn
             (
@@ -74,7 +76,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 rUA = 1.0/UEqn.A();
 
@@ -88,7 +90,8 @@ int main(int argc, char *argv[])
                 immersedBoundaryAdjustPhi(phi, U);
                 adjustPhi(phi, U, p);
 
-                for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+                // Non-orthogonal pressure corrector loop
+                while (pimple.correctNonOrthogonal())
                 {
                     fvScalarMatrix pEqn
                     (
@@ -98,7 +101,7 @@ int main(int argc, char *argv[])
                     pEqn.setReference(pRefCell, pRefValue);
                     pEqn.solve();
 
-                    if (nonOrth == nNonOrthCorr)
+                    if (pimple.finalNonOrthogonalIter())
                     {
                         phi -= pEqn.flux();
                     }
@@ -109,7 +112,7 @@ int main(int argc, char *argv[])
                 U -= rUA*fvc::grad(p);
                 U.correctBoundaryConditions();
             }
-        } while (++oCorr < nOuterCorr);
+        }
 
         runTime.write();
 

From c2cef7d11f37936c5423e71c6b698e967febce89 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Wed, 13 Apr 2016 11:39:55 +0200
Subject: [PATCH 13/55] Added select() function to GeometricField from vanilla
 (3.0.1)

---
 .../GeometricField/GeometricField.C             | 17 +++++++++++++++++
 .../GeometricField/GeometricField.H             |  5 +++++
 2 files changed, 22 insertions(+)

diff --git a/src/foam/fields/GeometricFields/GeometricField/GeometricField.C b/src/foam/fields/GeometricFields/GeometricField/GeometricField.C
index 6936a664c..d8bcf09d7 100644
--- a/src/foam/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/foam/fields/GeometricFields/GeometricField/GeometricField.C
@@ -932,6 +932,23 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::relax()
 }
 
 
+template<class Type, template<class> class PatchField, class GeoMesh>
+Foam::word Foam::GeometricField<Type, PatchField, GeoMesh>::select
+(
+    bool final
+) const
+{
+    if (final)
+    {
+        return this->name() + "Final";
+    }
+    else
+    {
+        return this->name();
+    }
+}
+
+
 // 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 25e29ef9e..6bfd6e31a 100644
--- a/src/foam/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/foam/fields/GeometricFields/GeometricField/GeometricField.H
@@ -491,6 +491,11 @@ public:
         //  alpha = 0 : do nothing
         void relax(const scalar alpha);
 
+        //- 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();

From a4f12aeb44d702d5172bf3debe238d51bbe4ce11 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Wed, 13 Apr 2016 16:21:35 +0200
Subject: [PATCH 14/55] Fixes for icoFoam, icoDyMFoam, icoDyMSimpleFoam,
 icoDyMEngineFoam, icoDyMIbFoam and icoIbFoam

---
 .../icoDyMEngineFoam/icoDyMEngineFoam.C       | 13 ++++--------
 .../icoDyMIbFoam/icoDyMIbFoam.C               | 13 ++++++++++--
 .../immersedBoundary/icoIbFoam/icoIbFoam.C    | 13 ++++++++++--
 .../solvers/incompressible/icoDyMFoam/UEqn.H  |  2 +-
 .../incompressible/icoDyMFoam/icoDyMFoam.C    | 13 ++++--------
 .../icoDyMSimpleFoam/icoDyMSimpleFoam.C       | 13 ++++--------
 .../solvers/incompressible/icoFoam/icoFoam.C  | 21 ++++++++++---------
 7 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C b/applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C
index e46417e14..f878585b2 100644
--- a/applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C
+++ b/applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C
@@ -112,15 +112,10 @@ int main(int argc, char *argv[])
                 );
 
                 pEqn.setReference(pRefCell, pRefValue);
-
-                if (piso.finalInnerIter())
-                {
-                    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 (piso.finalNonOrthogonalIter())
                 {
diff --git a/applications/solvers/immersedBoundary/icoDyMIbFoam/icoDyMIbFoam.C b/applications/solvers/immersedBoundary/icoDyMIbFoam/icoDyMIbFoam.C
index 20b187a0b..1930e329a 100644
--- a/applications/solvers/immersedBoundary/icoDyMIbFoam/icoDyMIbFoam.C
+++ b/applications/solvers/immersedBoundary/icoDyMIbFoam/icoDyMIbFoam.C
@@ -84,7 +84,10 @@ int main(int argc, char *argv[])
               - fvm::laplacian(nu, U)
             );
 
-            solve(UEqn == -fvc::grad(p));
+            if (pimple.momentumPredictor())
+            {
+                solve(UEqn == -fvc::grad(p));
+            }
 
             // --- PISO loop
             while (pimple.correct())
@@ -110,7 +113,13 @@ int main(int argc, char *argv[])
                     );
 
                     pEqn.setReference(pRefCell, pRefValue);
-                    pEqn.solve();
+                    pEqn.solve
+                    (
+                        mesh.solutionDict().solver
+                        (
+                            p.select(pimple.finalInnerIter())
+                        )
+                    );
 
                     if (pimple.finalNonOrthogonalIter())
                     {
diff --git a/applications/solvers/immersedBoundary/icoIbFoam/icoIbFoam.C b/applications/solvers/immersedBoundary/icoIbFoam/icoIbFoam.C
index 4d3c9ce33..4b6c987bc 100644
--- a/applications/solvers/immersedBoundary/icoIbFoam/icoIbFoam.C
+++ b/applications/solvers/immersedBoundary/icoIbFoam/icoIbFoam.C
@@ -73,7 +73,10 @@ int main(int argc, char *argv[])
               - fvm::laplacian(nu, U)
             );
 
-            solve(UEqn == -fvc::grad(p));
+            if (pimple.momentumPredictor())
+            {
+                solve(UEqn == -fvc::grad(p));
+            }
 
             // --- PISO loop
             while (pimple.correct())
@@ -99,7 +102,13 @@ int main(int argc, char *argv[])
                     );
 
                     pEqn.setReference(pRefCell, pRefValue);
-                    pEqn.solve();
+                    pEqn.solve
+                    (
+                        mesh.solutionDict().solver
+                        (
+                            p.select(pimple.finalInnerIter())
+                        )
+                    );
 
                     if (pimple.finalNonOrthogonalIter())
                     {
diff --git a/applications/solvers/incompressible/icoDyMFoam/UEqn.H b/applications/solvers/incompressible/icoDyMFoam/UEqn.H
index faf508468..4ebd9f839 100644
--- a/applications/solvers/incompressible/icoDyMFoam/UEqn.H
+++ b/applications/solvers/incompressible/icoDyMFoam/UEqn.H
@@ -5,7 +5,7 @@
       - fvm::laplacian(nu, U)
     );
 
-    if (momentumPredictor)
+    if (piso.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
     }
diff --git a/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C b/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C
index 2bd63eb2a..9acf3b2c1 100644
--- a/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C
+++ b/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C
@@ -113,15 +113,10 @@ int main(int argc, char *argv[])
                 );
 
                 pEqn.setReference(pRefCell, pRefValue);
-
-                if (piso.finalInnerIter())
-                {
-                    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 (piso.finalNonOrthogonalIter())
                 {
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C b/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
index bd86b5208..f72d5a7e3 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
@@ -118,15 +118,10 @@ int main(int argc, char *argv[])
                 );
 
                 pEqn.setReference(pRefCell, pRefValue);
-
-                if(piso.finalInnerIter())
-                {
-                    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 (piso.finalNonOrthogonalIter())
                 {
diff --git a/applications/solvers/incompressible/icoFoam/icoFoam.C b/applications/solvers/incompressible/icoFoam/icoFoam.C
index c7efa80cf..b130538bf 100644
--- a/applications/solvers/incompressible/icoFoam/icoFoam.C
+++ b/applications/solvers/incompressible/icoFoam/icoFoam.C
@@ -56,6 +56,8 @@ int main(int argc, char *argv[])
 
 #       include "CourantNo.H"
 
+        // Momentum predictor
+
         fvVectorMatrix UEqn
         (
             fvm::ddt(U)
@@ -63,9 +65,13 @@ int main(int argc, char *argv[])
           - fvm::laplacian(nu, U)
         );
 
-        solve(UEqn == -fvc::grad(p));
+        if (piso.momentumPredictor())
+        {
+            solve(UEqn == -fvc::grad(p));
+        }
 
         // --- PISO loop
+
         while (piso.correct())
         {
             volScalarField rUA = 1.0/UEqn.A();
@@ -85,15 +91,10 @@ int main(int argc, char *argv[])
                 );
 
                 pEqn.setReference(pRefCell, pRefValue);
-                    
-                if (piso.finalInnerIter())
-                {
-                    pEqn.solve(mesh.solutionDict().solver("pFinal"));
-                }
-                else
-                {
-                    pEqn.solve();
-                }
+                pEqn.solve
+                (
+                    mesh.solutionDict().solver(p.select(piso.finalInnerIter()))
+                );
 
                 if (piso.finalNonOrthogonalIter())
                 {

From cd8b1c64873431e471a4828e29ed6c032867009c Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Thu, 14 Apr 2016 17:34:33 +0200
Subject: [PATCH 15/55] Backport Switch from vanilla 3.0.1

---
 .../mesquiteMotionSolver.C                    |   4 +-
 src/foam/primitives/bools/Switch/Switch.C     | 113 ++++++++----------
 src/foam/primitives/bools/Switch/Switch.H     | 101 ++++++++--------
 src/foam/primitives/bools/Switch/SwitchIO.C   |  18 +--
 4 files changed, 109 insertions(+), 127 deletions(-)

diff --git a/src/dynamicMesh/meshMotion/mesquiteMotionSolver/mesquiteMotionSolver.C b/src/dynamicMesh/meshMotion/mesquiteMotionSolver/mesquiteMotionSolver.C
index 726f2f190..9c16388dd 100644
--- a/src/dynamicMesh/meshMotion/mesquiteMotionSolver/mesquiteMotionSolver.C
+++ b/src/dynamicMesh/meshMotion/mesquiteMotionSolver/mesquiteMotionSolver.C
@@ -2086,7 +2086,7 @@ void mesquiteMotionSolver::initParallelSurfaceSmoothing()
         parRead(procIndices_[pI], nProcSize[pI]);
 
         // Require a sync for size mismatch
-        bool requiresSync = false;
+        Switch requiresSync(false);
 
         if (nProcSize[pI] != sendSurfPointMap_[pI].size())
         {
@@ -2098,7 +2098,7 @@ void mesquiteMotionSolver::initParallelSurfaceSmoothing()
             Pout<< " neiProcNo: " << procIndices_[pI]
                 << " mySize: " << sendSurfPointMap_[pI].size()
                 << " neiSize: " << nProcSize[pI]
-                << " requireSync: " << Switch::asText(requiresSync)
+                << " requireSync: " << requiresSync.asText()
                 << endl;
         }
     }
diff --git a/src/foam/primitives/bools/Switch/Switch.C b/src/foam/primitives/bools/Switch/Switch.C
index e5e1ea844..615e9797c 100644
--- a/src/foam/primitives/bools/Switch/Switch.C
+++ b/src/foam/primitives/bools/Switch/Switch.C
@@ -37,6 +37,7 @@ const char* Foam::Switch::names[Foam::Switch::INVALID+1] =
     "off",   "on",
     "no",    "yes",
     "n",     "y",
+    "f",     "t",
     "none",  "true",  // is there a reasonable counterpart to "none"?
     "invalid"
 };
@@ -44,91 +45,61 @@ const char* Foam::Switch::names[Foam::Switch::INVALID+1] =
 
 // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
 
-Foam::Switch::switchType Foam::Switch::asEnum(const bool b)
-{
-    return b ? Switch::FOAM_TRUE : Switch::FOAM_FALSE;
-}
-
-
 Foam::Switch::switchType Foam::Switch::asEnum
 (
     const std::string& str,
     const bool allowInvalid
 )
 {
-    for (int sw = 0; sw < Switch::INVALID; sw++)
+    for (int sw = 0; sw < Switch::INVALID; ++sw)
     {
         if (str == names[sw])
         {
-            // convert n/y to no/yes (perhaps should deprecate y/n)
-            if (sw == Switch::NO_1 || sw == Switch::NONE)
+            // handle aliases
+            switch (sw)
             {
-                return Switch::NO;
-            }
-            else if (sw == Switch::YES_1)
-            {
-                return Switch::YES;
-            }
-            else
-            {
-                return switchType(sw);
+                case Switch::NO_1:
+                case Switch::NONE:
+                {
+                    return Switch::NO;
+                    break;
+                }
+
+                case Switch::YES_1:
+                {
+                    return Switch::YES;
+                    break;
+                }
+
+                case Switch::FALSE_1:
+                {
+                    return Switch::FALSE;
+                    break;
+                }
+
+                case Switch::TRUE_1:
+                {
+                    return Switch::TRUE;
+                    break;
+                }
+
+                default:
+                {
+                    return switchType(sw);
+                    break;
+                }
             }
         }
     }
 
     if (!allowInvalid)
     {
-        FatalErrorIn("Switch::asEnum(const std::string&)")
+        FatalErrorIn("Switch::asEnum(const std::string&, const bool)")
             << "unknown switch word " << str << nl
             << abort(FatalError);
     }
 
-    return INVALID;
-}
-
-
-bool Foam::Switch::asBool(const switchType sw)
-{
-    // relies on (INVALID & 0x1) evaluating to false
-    return (sw & 0x1);
-}
-
-
-bool Foam::Switch::asBool
-(
-    const std::string& str,
-    const bool allowInvalid
-)
-{
-    // allow invalid values, but catch after for correct error message
-    switchType sw = asEnum(str, true);
-
-    if (sw == Switch::INVALID)
-    {
-        if (!allowInvalid)
-        {
-            FatalErrorIn("Switch::asBool(const std::string&)")
-                << "unknown switch word " << str << nl
-                << abort(FatalError);
-        }
-
-        return false;
-    }
-
-
-    return (sw & 0x1);
-}
-
-
-const char* Foam::Switch::asText(const bool b)
-{
-    return b ? names[Switch::FOAM_TRUE] : names[Switch::FOAM_FALSE];
-}
-
-
-const char* Foam::Switch::asText(const switchType sw)
-{
-    return names[sw];
+    return Switch::INVALID;
 }
 
 
@@ -145,6 +116,18 @@ Foam::Switch Foam::Switch::lookupOrAddToDict
 
 // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
 
+bool Foam::Switch::valid() const
+{
+    return switch_ <= Switch::NONE;
+}
+
+
+const char* Foam::Switch::asText() const
+{
+    return names[switch_];
+}
+
+
 bool Foam::Switch::readIfPresent(const word& name, const dictionary& dict)
 {
     return dict.readIfPresent<Switch>(name, *this);
diff --git a/src/foam/primitives/bools/Switch/Switch.H b/src/foam/primitives/bools/Switch/Switch.H
index 84b13a606..fd1e02c60 100644
--- a/src/foam/primitives/bools/Switch/Switch.H
+++ b/src/foam/primitives/bools/Switch/Switch.H
@@ -26,7 +26,7 @@ Class
 
 Description
     A simple wrapper around bool so that it can be read as a word:
-    true/false, on/off, yes/no or y/n or none.
+    true/false, on/off, yes/no, y/n, t/f, or none.
 
 SourceFiles
     Switch.C
@@ -48,11 +48,11 @@ namespace Foam
 // Forward declaration of friend functions and operators
 
 class Switch;
+class dictionary;
 
 Istream& operator>>(Istream&, Switch&);
 Ostream& operator<<(Ostream&, const Switch&);
 
-class dictionary;
 
 /*---------------------------------------------------------------------------*\
                            Class Switch Declaration
@@ -60,8 +60,6 @@ class dictionary;
 
 class Switch
 {
-private:
-
     // Private data
 
         //- The logic and enumerated text representation stored as a single byte
@@ -75,11 +73,12 @@ public:
         //  These also correspond to the entries in names.
         enum switchType
         {
-            FOAM_FALSE = 0,  FOAM_TRUE  = 1,
-            OFF   = 2,  ON    = 3,
-            NO    = 4,  YES   = 5,
-            NO_1  = 6,  YES_1 = 7,
-            NONE  = 8,  PLACEHOLDER = 9,
+            FALSE   = 0,  TRUE   = 1,
+            OFF     = 2,  ON     = 3,
+            NO      = 4,  YES    = 5,
+            NO_1    = 6,  YES_1  = 7,
+            FALSE_1 = 8,  TRUE_1 = 9,
+            NONE    = 10, PLACEHOLDER = 11,
             INVALID
         };
 
@@ -91,67 +90,54 @@ public:
         static const char* names[INVALID+1];
 
 
+private:
+
     // Static Member Functions
 
-        //- Return a switchType representation of a bool
-        static switchType asEnum(const bool);
-
         //- Return a switchType representation of a word
-        //  Optionally allow bad words, and catch the error elsewhere
-        static switchType asEnum
-        (
-            const std::string&,
-            const bool allowInvalid=false
-        );
+        static switchType asEnum(const std::string&, const bool allowInvalid);
 
-        //- Return a bool representation of a switchType
-        static bool asBool(const switchType);
-
-        //- Return a bool representation of a word
-        //  Optionally allow bad words, and catch the error elsewhere
-        static bool asBool
-        (
-            const std::string&,
-            const bool allowInvalid=false
-        );
-
-        //- Return a text representation of a bool value
-        static const char* asText(const bool);
-
-        //- Return a text representation of a switchType
-        static const char* asText(const switchType);
 
+public:
 
     // Constructors
 
         //- Construct null as false
         Switch()
         :
-            switch_(Switch::FOAM_FALSE)
+            switch_(Switch::FALSE)
+        {}
+
+        //- Construct from enumerated value
+        Switch(const switchType sw)
+        :
+            switch_(sw)
         {}
 
         //- Construct from bool
-        Switch(const bool value)
+        Switch(const bool b)
         :
-            switch_(asEnum(value))
+            switch_(b ? Switch::TRUE : Switch::FALSE)
         {}
 
         //- Construct from integer values (treats integer as bool value)
-        Switch(const int value)
+        Switch(const int i)
         :
-            switch_(asEnum(bool(value)))
+            switch_(i ? Switch::TRUE : Switch::FALSE)
         {}
 
         //- Construct from std::string, string, word
-        Switch(const std::string& value)
+        //  Optionally allow bad words, and catch the error elsewhere
+        Switch(const std::string& str, const bool allowInvalid=false)
         :
-            switch_(asEnum(value))
+            switch_(asEnum(str, allowInvalid))
         {}
 
         //- Construct from character array
-        Switch(const char* value)
+        //  Optionally allow bad words, and catch the error elsewhere
+        Switch(const char* str, const bool allowInvalid=false)
         :
-            switch_(asEnum(std::string(value)))
+            switch_(asEnum(std::string(str), allowInvalid))
         {}
 
         //- Construct from Istream
@@ -167,6 +153,18 @@ public:
         );
 
 
+    // Member Functions
+
+        //- Return true if the Switch has a valid value
+        bool valid() const;
+
+        //- Return a text representation of the Switch
+        const char* asText() const;
+
+        //- Update the value of the Switch if it is found in the dictionary
+        bool readIfPresent(const word&, const dictionary&);
+
+
     // Member Operators
 
         //- Conversion to bool
@@ -175,18 +173,19 @@ public:
             return (switch_ & 0x1);
         }
 
-        //- Assignment from bool
-        const Switch& operator=(const bool b)
+        //- Assignment from enumerated value
+        const Switch& operator=(const switchType sw)
         {
-            switch_ = (b ? Switch::FOAM_TRUE : Switch::FOAM_FALSE);
+            switch_ = sw;
             return *this;
         }
 
-
-    // Member fuctions
-
-        //- Update the value of the Switch if it is found in the dictionary
-        bool readIfPresent(const word&, const dictionary&);
+        //- Assignment from bool
+        const Switch& operator=(const bool b)
+        {
+            switch_ = (b ? Switch::TRUE : Switch::FALSE);
+            return *this;
+        }
 
 
     // IOstream Operators
diff --git a/src/foam/primitives/bools/Switch/SwitchIO.C b/src/foam/primitives/bools/Switch/SwitchIO.C
index 59ccfde2a..a489f5602 100644
--- a/src/foam/primitives/bools/Switch/SwitchIO.C
+++ b/src/foam/primitives/bools/Switch/SwitchIO.C
@@ -48,32 +48,32 @@ Foam::Istream& Foam::operator>>(Istream& is, Switch& s)
 
     if (t.isLabel())
     {
-        s.switch_ = Switch::asEnum(bool(t.labelToken()));
+        s = bool(t.labelToken());
     }
     else if (t.isWord())
     {
         // allow invalid values, but catch after for correct error message
-        Switch::switchType sw = Switch::asEnum(t.wordToken(), true);
+        Switch sw(t.wordToken(), true);
 
-        if (sw == Switch::INVALID)
+        if (sw.valid())
+        {
+            s = sw;
+        }
+        else
         {
             is.setBad();
-            FatalIOErrorIn("operator>>(Istream&, Switch&)", is)
+            FatalIOErrorIn("operator>>(Istream&, bool/Switch&)", is)
                 << "expected 'true/false', 'on/off' ... found " << t.wordToken()
                 << exit(FatalIOError);
 
             return is;
         }
-        else
-        {
-            s.switch_ = sw;
-        }
     }
     else
     {
         is.setBad();
         FatalIOErrorIn("operator>>(Istream&, bool/Switch&)", is)
-            << "wrong token type - expected bool found " << t
+            << "wrong token type - expected bool, found " << t
             << exit(FatalIOError);
 
         return is;

From 02b093974bc68074e8ec4945b1ab2cd18074869e Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Thu, 14 Apr 2016 17:35:02 +0200
Subject: [PATCH 16/55] Backport writeCompression from vanilla 3.0.1

---
 src/foam/db/IOstreams/IOstreams/IOstream.C | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/foam/db/IOstreams/IOstreams/IOstream.C b/src/foam/db/IOstreams/IOstreams/IOstream.C
index 11e72ddac..5af3cc391 100644
--- a/src/foam/db/IOstreams/IOstreams/IOstream.C
+++ b/src/foam/db/IOstreams/IOstreams/IOstream.C
@@ -27,6 +27,7 @@ Description
 
 #include "IOstream.H"
 #include "error.H"
+#include "Switch.H"
 #include <sstream>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -61,7 +62,14 @@ Foam::IOstream::formatEnum(const word& format)
 Foam::IOstream::compressionType
 Foam::IOstream::compressionEnum(const word& compression)
 {
-    if (compression == "uncompressed")
+    // get Switch (bool) value, but allow it to fail
+    Switch sw(compression, true);
+
+    if (sw.valid())
+    {
+        return sw ? IOstream::COMPRESSED : IOstream::UNCOMPRESSED;
+    }
+    else if (compression == "uncompressed")
     {
         return IOstream::UNCOMPRESSED;
     }

From ef3edbe2ba2c306886da144cfb907b60068ada4a Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Thu, 14 Apr 2016 17:35:51 +0200
Subject: [PATCH 17/55] Add setFluxRequired to ico-Solvers

---
 applications/solvers/engine/icoDyMEngineFoam/createFields.H   | 1 +
 .../solvers/immersedBoundary/icoDyMIbFoam/createFields.H      | 4 ++++
 .../solvers/immersedBoundary/icoIbFoam/createFields.H         | 3 ++-
 applications/solvers/incompressible/icoDyMFoam/createFields.H | 1 +
 .../solvers/incompressible/icoDyMSimpleFoam/createFields.H    | 1 +
 applications/solvers/incompressible/icoFoam/createFields.H    | 2 +-
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/applications/solvers/engine/icoDyMEngineFoam/createFields.H b/applications/solvers/engine/icoDyMEngineFoam/createFields.H
index 2665626f3..9e28b859b 100644
--- a/applications/solvers/engine/icoDyMEngineFoam/createFields.H
+++ b/applications/solvers/engine/icoDyMEngineFoam/createFields.H
@@ -53,6 +53,7 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
     scalar totalVolume = sum(mesh.V()).value();
 
diff --git a/applications/solvers/immersedBoundary/icoDyMIbFoam/createFields.H b/applications/solvers/immersedBoundary/icoDyMIbFoam/createFields.H
index 94776ab99..51c10db46 100644
--- a/applications/solvers/immersedBoundary/icoDyMIbFoam/createFields.H
+++ b/applications/solvers/immersedBoundary/icoDyMIbFoam/createFields.H
@@ -17,6 +17,7 @@
         transportProperties.lookup("nu")
     );
 
+
     Info<< "Reading field p\n" << endl;
     volScalarField p
     (
@@ -31,6 +32,7 @@
         mesh
     );
 
+
     Info<< "Reading field U\n" << endl;
     volVectorField U
     (
@@ -47,6 +49,8 @@
 
 #   include "createPhi.H"
 
+
     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
diff --git a/applications/solvers/immersedBoundary/icoIbFoam/createFields.H b/applications/solvers/immersedBoundary/icoIbFoam/createFields.H
index a2031e291..51c10db46 100644
--- a/applications/solvers/immersedBoundary/icoIbFoam/createFields.H
+++ b/applications/solvers/immersedBoundary/icoIbFoam/createFields.H
@@ -17,6 +17,7 @@
         transportProperties.lookup("nu")
     );
 
+
     Info<< "Reading field p\n" << endl;
     volScalarField p
     (
@@ -46,10 +47,10 @@
         mesh
     );
 
-
 #   include "createPhi.H"
 
 
     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
diff --git a/applications/solvers/incompressible/icoDyMFoam/createFields.H b/applications/solvers/incompressible/icoDyMFoam/createFields.H
index d4d011004..4b37f06a1 100644
--- a/applications/solvers/incompressible/icoDyMFoam/createFields.H
+++ b/applications/solvers/incompressible/icoDyMFoam/createFields.H
@@ -53,6 +53,7 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
 
     Info<< "Reading field rAU if present\n" << endl;
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H b/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H
index d4d011004..4b37f06a1 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H
@@ -53,6 +53,7 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
 
     Info<< "Reading field rAU if present\n" << endl;
diff --git a/applications/solvers/incompressible/icoFoam/createFields.H b/applications/solvers/incompressible/icoFoam/createFields.H
index f2374b961..4fc0be97a 100644
--- a/applications/solvers/incompressible/icoFoam/createFields.H
+++ b/applications/solvers/incompressible/icoFoam/createFields.H
@@ -17,6 +17,7 @@
         transportProperties.lookup("nu")
     );
 
+
     Info<< "Reading field p\n" << endl;
     volScalarField p
     (
@@ -46,7 +47,6 @@
         mesh
     );
 
-
 #   include "createPhi.H"
 
 

From 05e63d508430d4095760204b5e068bbc6e2b2ac9 Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Fri, 15 Apr 2016 21:31:14 +0200
Subject: [PATCH 18/55] Backport limited schemes format from vanilla 3.0.1

---
 .../limitedSchemes/linearUpwind/linearUpwind.H        | 11 +++++++++--
 .../simpleFoam/pitzDaily/system/fvSchemes             |  9 ++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H
index 70b05bcda..12a12b2da 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H
@@ -55,6 +55,10 @@ class linearUpwind
 {
     // Private Data
 
+        //- Name of gradient scheme
+        word gradSchemeName_;
+
+        //- Gradient scheme
         tmp<fv::gradScheme<Type> > gradScheme_;
 
 
@@ -83,6 +87,7 @@ public:
         )
         :
             upwind<Type>(mesh, faceFlux),
+            gradSchemeName_("grad"),
             gradScheme_
             (
                 new fv::gaussGrad<Type>(mesh)
@@ -99,12 +104,13 @@ public:
         )
         :
             upwind<Type>(mesh, schemeData),
+            gradSchemeName_(schemeData),
             gradScheme_
             (
                 fv::gradScheme<Type>::New
                 (
                     mesh,
-                    schemeData
+                    mesh.schemesDict().gradScheme(gradSchemeName_)
                 )
             )
         {}
@@ -118,12 +124,13 @@ public:
         )
         :
             upwind<Type>(mesh, faceFlux, schemeData),
+            gradSchemeName_(schemeData),
             gradScheme_
             (
                 fv::gradScheme<Type>::New
                 (
                     mesh,
-                    schemeData
+                    mesh.schemesDict.gradScheme(gradSchemeName_)
                 )
             )
         {}
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
index 4982acade..b37aab24a 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
@@ -35,7 +35,8 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
+    div(nonlinearStress) Gauss linear;
 }
 
 laplacianSchemes
@@ -62,10 +63,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //

From da99a391094c58461f9eb71d71744fac67542760 Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Fri, 15 Apr 2016 22:24:56 +0200
Subject: [PATCH 19/55] Some constness and output

---
 .../faConvectionScheme/faConvectionScheme.C   |  4 +-
 .../ddtSchemes/faDdtScheme/faDdtScheme.C      |  6 +--
 .../divSchemes/faDivScheme/faDivScheme.C      |  5 ++-
 .../gradSchemes/faGradScheme/faGradScheme.C   | 10 +++--
 .../faLaplacianScheme/faLaplacianScheme.C     |  6 +--
 .../lnGradSchemes/lnGradScheme/lnGradScheme.C |  8 ++--
 .../edgeInterpolationScheme.C                 | 37 +++++++++++++------
 .../adjConvectionScheme/adjConvectionScheme.C |  2 +-
 .../convectionScheme/convectionScheme.C       |  8 ++--
 .../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C    |  4 +-
 .../ddtSchemes/ddtScheme/ddtScheme.C          |  6 +--
 .../divSchemes/divScheme/divScheme.C          |  5 ++-
 .../gradSchemes/gradScheme/gradScheme.C       | 14 ++++---
 .../laplacianScheme/laplacianScheme.C         |  6 +--
 .../snGradSchemes/snGradScheme/snGradScheme.C |  6 +--
 .../limitedSurfaceInterpolationScheme.C       |  4 +-
 .../multivariateSurfaceInterpolationScheme.C  |  2 +-
 .../surfaceInterpolationScheme.C              | 29 ++++++++++-----
 18 files changed, 97 insertions(+), 65 deletions(-)

diff --git a/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.C b/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.C
index 0f64fb8b4..12ad236f3 100644
--- a/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.C
+++ b/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.C
@@ -72,7 +72,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename IstreamConstructorTable::iterator cstrIter =
         IstreamConstructorTablePtr_->find(schemeName);
@@ -84,7 +84,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
             "convectionScheme<Type>::New"
             "(const faMesh&, const edgeScalarField&, Istream&)",
             schemeData
-        )   << "unknown convection scheme " << schemeName << endl << endl
+        )   << "Unknown convection scheme " << schemeName << nl << nl
             << "Valid convection schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
diff --git a/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.C
index a3a5b5a08..9be93f634 100644
--- a/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.C
+++ b/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.C
@@ -61,13 +61,13 @@ tmp<faDdtScheme<Type> > faDdtScheme<Type>::New
         (
             "faDdtScheme<Type>::New(const faMesh&, Istream&)",
             schemeData
-        )   << "Ddt scheme not specified" << endl << endl
+        )   << "Ddt scheme not specified" << nl << nl
             << "Valid ddt schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename IstreamConstructorTable::iterator cstrIter =
         IstreamConstructorTablePtr_->find(schemeName);
@@ -78,7 +78,7 @@ tmp<faDdtScheme<Type> > faDdtScheme<Type>::New
         (
             "faDdtScheme<Type>::New(const faMesh&, Istream&)",
             schemeData
-        )   << "unknown ddt scheme " << schemeName << endl << endl
+        )   << "Unknown ddt scheme " << schemeName << nl << nl
             << "Valid ddt schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
diff --git a/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.C b/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.C
index 8e5af750f..063f479e0 100644
--- a/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.C
+++ b/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.C
@@ -68,7 +68,7 @@ tmp<divScheme<Type> > divScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename IstreamConstructorTable::iterator cstrIter =
         IstreamConstructorTablePtr_->find(schemeName);
@@ -79,7 +79,8 @@ tmp<divScheme<Type> > divScheme<Type>::New
         (
             "divScheme<Type>::New(const faMesh&, Istream&)",
             schemeData
-        )   << "unknown div scheme " << schemeName << endl << endl
+        )   << "Unknown div scheme "
+            << schemeName << nl << nl
             << "Valid div schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
diff --git a/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.C b/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.C
index 6ffbcfc6a..ff5449fee 100644
--- a/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.C
+++ b/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.C
@@ -59,7 +59,8 @@ tmp<gradScheme<Type> > gradScheme<Type>::New
     {
         FatalIOErrorIn
         (
-            "gradScheme<Type>::New(Istream& schemeData)",
+            "gradScheme<Type>::New"
+            "(const faMesh& mesh, Istream& schemeData)",
             schemeData
         )   << "Grad scheme not specified" << endl << endl
             << "Valid grad schemes are :" << endl
@@ -67,7 +68,7 @@ tmp<gradScheme<Type> > gradScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename IstreamConstructorTable::iterator cstrIter =
         IstreamConstructorTablePtr_->find(schemeName);
@@ -76,9 +77,10 @@ tmp<gradScheme<Type> > gradScheme<Type>::New
     {
         FatalIOErrorIn
         (
-            "gradScheme<Type>::New(Istream& schemeData)",
+            "gradScheme<Type>::New"
+            "(const faMesh& mesh, Istream& schemeData)",
             schemeData
-        )   << "unknown grad scheme " << schemeName << endl << endl
+        )   << "Unknown grad scheme " << schemeName << nl << nl
             << "Valid grad schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
diff --git a/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.C b/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.C
index 38ff53a40..7f8b193cf 100644
--- a/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.C
+++ b/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.C
@@ -62,13 +62,13 @@ tmp<laplacianScheme<Type> > laplacianScheme<Type>::New
         (
             "laplacianScheme<Type>::New(const faMesh&, Istream&)",
             schemeData
-        )   << "Laplacian scheme not specified" << endl << endl
+        )   << "Laplacian scheme not specified" << nl << nl
             << "Valid laplacian schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename IstreamConstructorTable::iterator cstrIter =
         IstreamConstructorTablePtr_->find(schemeName);
@@ -79,7 +79,7 @@ tmp<laplacianScheme<Type> > laplacianScheme<Type>::New
         (
             "laplacianScheme<Type>::New(const faMesh&, Istream&)",
             schemeData
-        )   << "unknown laplacian scheme " << schemeName << endl << endl
+        )   << "Unknown laplacian scheme " << schemeName << nl << nl
             << "Valid laplacian schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
diff --git a/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.C b/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.C
index e28b9a52c..c26110a62 100644
--- a/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.C
+++ b/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.C
@@ -71,7 +71,7 @@ tmp<lnGradScheme<Type> > lnGradScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename MeshConstructorTable::iterator constructorIter =
         MeshConstructorTablePtr_->find(schemeName);
@@ -82,8 +82,8 @@ tmp<lnGradScheme<Type> > lnGradScheme<Type>::New
         (
             "lnGradScheme<Type>::New(const faMesh&, Istream&)",
             schemeData
-        )   << "Unknown discretisation scheme " << schemeName
-            << endl << endl
+        )   << "Unknown discretisation scheme "
+            << schemeName << nl << nl
             << "Valid schemes are :" << endl
             << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
@@ -122,7 +122,7 @@ lnGradScheme<Type>::lnGrad
         (
             IOobject
             (
-                lnGradName + vf.name() + ')',
+                lnGradName + "("+vf.name()+')',
                 vf.instance(),
                 vf.db(),
                 IOobject::NO_READ,
diff --git a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.C b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.C
index 43c1d9451..ea30ca271 100644
--- a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.C
+++ b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.C
@@ -68,7 +68,7 @@ tmp<edgeInterpolationScheme<Type> > edgeInterpolationScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename MeshConstructorTable::iterator constructorIter =
         MeshConstructorTablePtr_->find(schemeName);
@@ -79,8 +79,8 @@ tmp<edgeInterpolationScheme<Type> > edgeInterpolationScheme<Type>::New
         (
             "edgeInterpolationScheme<Type>::New(const faMesh&, Istream&)",
             schemeData
-        )   << "Unknown discretisation scheme " << schemeName
-            << endl << endl
+        )   << "Unknown discretisation scheme "
+            << schemeName << nl << nl
             << "Valid schemes are :" << endl
             << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
@@ -121,7 +121,7 @@ tmp<edgeInterpolationScheme<Type> > edgeInterpolationScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename MeshFluxConstructorTable::iterator constructorIter =
         MeshFluxConstructorTablePtr_->find(schemeName);
@@ -133,8 +133,8 @@ tmp<edgeInterpolationScheme<Type> > edgeInterpolationScheme<Type>::New
             "edgeInterpolationScheme<Type>::New"
             "(const faMesh&, const edgeScalarField&, Istream&)",
             schemeData
-        )   << "Unknown discretisation scheme " << schemeName
-            << endl << endl
+        )   << "Unknown discretisation scheme "
+            << schemeName << nl << nl
             << "Valid schemes are :" << endl
             << MeshFluxConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
@@ -170,7 +170,10 @@ edgeInterpolationScheme<Type>::interpolate
                "(const GeometricField<Type, faPatchField, areaMesh>&, "
                "const tmp<edgeScalarField>&, "
                "const tmp<edgeScalarField>&) : "
-               "interpolating areaTypeField from cells to faces "
+               "interpolating "
+            << vf.type() << " "
+            << vf.name()
+            << " from areas to edges "
                "without explicit correction"
             << endl;
     }
@@ -290,7 +293,10 @@ edgeInterpolationScheme<Type>::interpolate
         Info<< "edgeInterpolationScheme<Type>::interpolate"
                "(const GeometricField<Type, faPatchField, areaMesh>&, "
                "const tmp<edgeScalarField>&) : "
-               "interpolating areaTypeField from cells to faces "
+               "interpolating "
+            << vf.type() << " "
+            << vf.name()
+            << " from area to edges "
                "without explicit correction"
             << endl;
     }
@@ -406,7 +412,10 @@ edgeInterpolationScheme<Type>::euclidianInterpolate
         Info<< "edgeInterpolationScheme<Type>::euclidianInterpolate"
                "(const GeometricField<Type, faPatchField, areaMesh>&, "
                "const tmp<edgeScalarField>&) : "
-               "interpolating areaTypeField from cells to faces "
+            << "interpolating "
+            << vf.type() << " "
+            << vf.name()
+            << " from area to edges "
                "without explicit correction"
             << endl;
     }
@@ -481,7 +490,10 @@ edgeInterpolationScheme<Type>::interpolate
     {
         Info<< "edgeInterpolationScheme<Type>::interpolate"
                "(const GeometricField<Type, faPatchField, areaMesh>&) : "
-            << "interpolating areaTypeField from cells to faces"
+               "interpolating "
+            << vf.type() << " "
+            << vf.name()
+            << " from areas to edges"
             << endl;
     }
 
@@ -509,7 +521,10 @@ edgeInterpolationScheme<Type>::euclidianInterpolate
     {
         Info<< "edgeInterpolationScheme<Type>::interpolate"
                "(const GeometricField<Type, faPatchField, areaMesh>&) : "
-            << "interpolating areaTypeField from cells to faces"
+            << "interpolating "
+            << vf.type() << " "
+            << vf.name()
+            << " from area to edges "
             << endl;
     }
 
diff --git a/src/finiteVolume/finiteVolume/adjConvectionSchemes/adjConvectionScheme/adjConvectionScheme.C b/src/finiteVolume/finiteVolume/adjConvectionSchemes/adjConvectionScheme/adjConvectionScheme.C
index c5c7025e6..63814a800 100644
--- a/src/finiteVolume/finiteVolume/adjConvectionSchemes/adjConvectionScheme/adjConvectionScheme.C
+++ b/src/finiteVolume/finiteVolume/adjConvectionSchemes/adjConvectionScheme/adjConvectionScheme.C
@@ -82,7 +82,7 @@ tmp<adjConvectionScheme<Type> > adjConvectionScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename IstreamConstructorTable::iterator cstrIter =
         IstreamConstructorTablePtr_->find(schemeName);
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
index f902add16..3fe4c72c9 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
@@ -82,7 +82,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename IstreamConstructorTable::iterator cstrIter =
         IstreamConstructorTablePtr_->find(schemeName);
@@ -94,7 +94,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
             "convectionScheme<Type>::New"
             "(const fvMesh&, const surfaceScalarField&, Istream&)",
             schemeData
-        )   << "unknown convection scheme " << schemeName << endl << endl
+        )   << "Unknown convection scheme " << schemeName << nl << nl
             << "Valid convection schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
@@ -139,7 +139,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename MultivariateConstructorTable::iterator cstrIter =
         MultivariateConstructorTablePtr_->find(schemeName);
@@ -153,7 +153,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
             "const typename multivariateSurfaceInterpolationScheme<Type>"
             "::fieldTable&, const surfaceScalarField&, Istream&)",
             schemeData
-        )   << "unknown convection scheme " << schemeName << endl << endl
+        )   << "Unknown convection scheme " << schemeName << nl << nl
             << "Valid convection schemes are :" << endl
             << MultivariateConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
index 99febc681..a40a398f0 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
@@ -67,7 +67,7 @@ tmp<d2dt2Scheme<Type> > d2dt2Scheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename IstreamConstructorTable::iterator cstrIter =
         IstreamConstructorTablePtr_->find(schemeName);
@@ -78,7 +78,7 @@ tmp<d2dt2Scheme<Type> > d2dt2Scheme<Type>::New
         (
             "d2dt2Scheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
-        )   << "unknown d2dt2 scheme " << schemeName << endl << endl
+        )   << "Unknown d2dt2 scheme " << schemeName << nl << nl
             << "Valid d2dt2 schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index 37766bea8..5ebf0401b 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -59,13 +59,13 @@ tmp<ddtScheme<Type> > ddtScheme<Type>::New
         (
             "ddtScheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
-        )   << "Ddt scheme not specified" << endl << endl
+        )   << "Ddt scheme not specified" << nl << nl
             << "Valid ddt schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename IstreamConstructorTable::iterator cstrIter =
         IstreamConstructorTablePtr_->find(schemeName);
@@ -76,7 +76,7 @@ tmp<ddtScheme<Type> > ddtScheme<Type>::New
         (
             "ddtScheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
-        )   << "unknown ddt scheme " << schemeName << endl << endl
+        )   << "Unknown ddt scheme " << schemeName << nl << nl
             << "Valid ddt schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
index e5b3b9f2c..41a3f8736 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
@@ -68,7 +68,7 @@ tmp<divScheme<Type> > divScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename IstreamConstructorTable::iterator cstrIter =
         IstreamConstructorTablePtr_->find(schemeName);
@@ -79,7 +79,8 @@ tmp<divScheme<Type> > divScheme<Type>::New
         (
             "divScheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
-        )   << "unknown div scheme " << schemeName << endl << endl
+        )   << "Unknown div scheme "
+            << schemeName << nl << nl
             << "Valid div schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
index 644a25fe5..1087cced4 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
@@ -52,7 +52,8 @@ tmp<gradScheme<Type> > gradScheme<Type>::New
 {
     if (fv::debug)
     {
-        Info<< "gradScheme<Type>::New(Istream& schemeData) : "
+        Info<< "gradScheme<Type>::New"
+               "(const fvMesh& mesh, Istream& schemeData) : "
                "constructing gradScheme<Type>"
             << endl;
     }
@@ -61,7 +62,8 @@ tmp<gradScheme<Type> > gradScheme<Type>::New
     {
         FatalIOErrorIn
         (
-            "gradScheme<Type>::New(Istream& schemeData)",
+            "gradScheme<Type>::New"
+            "(const fvMesh& mesh, Istream& schemeData)",
             schemeData
         )   << "Grad scheme not specified" << endl << endl
             << "Valid grad schemes are :" << endl
@@ -69,7 +71,7 @@ tmp<gradScheme<Type> > gradScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename IstreamConstructorTable::iterator cstrIter =
         IstreamConstructorTablePtr_->find(schemeName);
@@ -78,9 +80,10 @@ tmp<gradScheme<Type> > gradScheme<Type>::New
     {
         FatalIOErrorIn
         (
-            "gradScheme<Type>::New(Istream& schemeData)",
+            "gradScheme<Type>::New"
+            "(const fvMesh& mesh, Istream& schemeData)",
             schemeData
-        )   << "unknown grad scheme " << schemeName << endl << endl
+        )   << "Unknown grad scheme " << schemeName << nl << nl
             << "Valid grad schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
@@ -226,6 +229,7 @@ Foam::fv::gradScheme<Type>::grad
     }
 }
 
+
 template<class Type>
 Foam::tmp
 <
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
index 202a29a88..d62f2e631 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
@@ -60,13 +60,13 @@ tmp<laplacianScheme<Type, GType> > laplacianScheme<Type, GType>::New
         (
             "laplacianScheme<Type, GType>::New(const fvMesh&, Istream&)",
             schemeData
-        )   << "Laplacian scheme not specified" << endl << endl
+        )   << "Laplacian scheme not specified" << nl << nl
             << "Valid laplacian schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename IstreamConstructorTable::iterator cstrIter =
         IstreamConstructorTablePtr_->find(schemeName);
@@ -77,7 +77,7 @@ tmp<laplacianScheme<Type, GType> > laplacianScheme<Type, GType>::New
         (
             "laplacianScheme<Type, GType>::New(const fvMesh&, Istream&)",
             schemeData
-        )   << "unknown laplacian scheme " << schemeName << endl << endl
+        )   << "Unknown laplacian scheme " << schemeName << nl << nl
             << "Valid laplacian schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
index 680ff6975..e22fe1824 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -68,7 +68,7 @@ tmp<snGradScheme<Type> > snGradScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename MeshConstructorTable::iterator constructorIter =
         MeshConstructorTablePtr_->find(schemeName);
@@ -79,8 +79,8 @@ tmp<snGradScheme<Type> > snGradScheme<Type>::New
         (
             "snGradScheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
-        )   << "Unknown discretisation scheme " << schemeName
-            << endl << endl
+        )   << "Unknown discretisation scheme "
+            << schemeName << nl << nl
             << "Valid schemes are :" << endl
             << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
index f4159d1cb..133cf3253 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
@@ -66,7 +66,7 @@ limitedSurfaceInterpolationScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename MeshConstructorTable::iterator constructorIter =
         MeshConstructorTablePtr_->find(schemeName);
@@ -121,7 +121,7 @@ limitedSurfaceInterpolationScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename MeshFluxConstructorTable::iterator constructorIter =
         MeshFluxConstructorTablePtr_->find(schemeName);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
index bc86b7169..e66a2ed79 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
@@ -76,7 +76,7 @@ multivariateSurfaceInterpolationScheme<Type>::New
             << endl;
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     typename IstreamConstructorTable::iterator constructorIter =
         IstreamConstructorTablePtr_->find(schemeName);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index fdfc86e97..67f1e9c95 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -59,7 +59,7 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     if (surfaceInterpolation::debug || surfaceInterpolationScheme<Type>::debug)
     {
@@ -79,8 +79,8 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
         (
             "surfaceInterpolationScheme<Type>::New(const fvMesh&, Istream&)",
             schemeData
-        )   << "Unknown discretisation scheme " << schemeName
-            << endl << endl
+        )   << "Unknown discretisation scheme "
+            << schemeName << nl << nl
             << "Valid schemes are :" << endl
             << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
@@ -113,7 +113,7 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
             << exit(FatalIOError);
     }
 
-    word schemeName(schemeData);
+    const word schemeName(schemeData);
 
     if (surfaceInterpolation::debug || surfaceInterpolationScheme<Type>::debug)
     {
@@ -134,8 +134,8 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
             "surfaceInterpolationScheme<Type>::New"
             "(const fvMesh&, const surfaceScalarField&, Istream&)",
             schemeData
-        )   << "Unknown discretisation scheme " << schemeName
-            << endl << endl
+        )   << "Unknown discretisation scheme "
+            << schemeName << nl << nl
             << "Valid schemes are :" << endl
             << MeshFluxConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
@@ -171,7 +171,10 @@ surfaceInterpolationScheme<Type>::interpolate
                "(const GeometricField<Type, fvPatchField, volMesh>&, "
                "const tmp<surfaceScalarField>&, "
                "const tmp<surfaceScalarField>&) : "
-               "interpolating volTypeField from cells to faces "
+               "interpolating "
+            << vf.type() << " "
+            << vf.name()
+            << " from cells to faces "
                "without explicit correction"
             << endl;
     }
@@ -231,7 +234,7 @@ surfaceInterpolationScheme<Type>::interpolate
 
 
 //- Return the face-interpolate of the given cell field
-//  with the given weigting factors
+//  with the given weighting factors
 template<class Type>
 tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
 surfaceInterpolationScheme<Type>::interpolate
@@ -245,7 +248,10 @@ surfaceInterpolationScheme<Type>::interpolate
         Info<< "surfaceInterpolationScheme<Type>::interpolate"
                "(const GeometricField<Type, fvPatchField, volMesh>&, "
                "const tmp<surfaceScalarField>&) : "
-               "interpolating volTypeField from cells to faces "
+               "interpolating "
+            << vf.type() << " "
+            << vf.name()
+            << " from cells to faces "
                "without explicit correction"
             << endl;
     }
@@ -313,7 +319,10 @@ surfaceInterpolationScheme<Type>::interpolate
     {
         Info<< "surfaceInterpolationScheme<Type>::interpolate"
                "(const GeometricField<Type, fvPatchField, volMesh>&) : "
-            << "interpolating volTypeField from cells to faces"
+               "interpolating "
+            << vf.type() << " "
+            << vf.name()
+            << " from cells to faces"
             << endl;
     }
 

From 7c0b9aee420e85350e391153e14b3e8c82bbf9c8 Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Fri, 15 Apr 2016 22:39:55 +0200
Subject: [PATCH 20/55] Backport some Tensor classes (T() function in
 particular) from vanilla 3.0.1

---
 src/foam/Make/files                           |   1 +
 .../dimensionedSymmTensor.C                   |  13 +-
 .../dimensionedSymmTensor.H                   |   1 +
 .../symmTensorFieldField.C                    |   4 +
 .../symmTensorFieldField.H                    |   4 +
 .../Fields/symmTensorField/symmTensorField.C  |   4 +
 .../Fields/symmTensorField/symmTensorField.H  |   5 +
 .../GeometricSymmTensorField.C                |   8 +-
 .../GeometricSymmTensorField.H                |   7 +-
 .../GeometricTensorField.C                    |  13 +-
 .../GeometricTensorField.H                    |   1 +
 .../GeometricTensorNFields.C                  |   2 +-
 .../GeometricTensorNFields.H                  |   1 +
 .../SphericalTensorTemplateI.H                |  34 +-
 .../SymmTensor/SymmTensorTemplate.H           |   3 +-
 .../SymmTensor/SymmTensorTemplateI.H          | 113 ++--
 .../SymmTensor/symmTensor/symmTensor.C        |   8 +
 .../SymmTensor2D/SymmTensor2DTemplate.H       | 147 +++++
 .../SymmTensor2D/SymmTensor2DTemplateI.H      | 517 ++++++++++++++++++
 .../SymmTensor2D/symmTensor2D/symmTensor2D.C  |  85 +++
 .../SymmTensor2D/symmTensor2D/symmTensor2D.H  |  63 +++
 .../SymmTensor4thOrderTemplate.H              |   2 +-
 .../SymmTensor4thOrderTemplateI.H             |  52 +-
 src/foam/primitives/Tensor/TensorTemplate.H   |  20 +-
 src/foam/primitives/Tensor/TensorTemplateI.H  | 232 +++++---
 src/foam/primitives/Tensor/tensor/tensor.C    |  17 +-
 .../primitives/Tensor2D/Tensor2DTemplate.H    |  12 +-
 .../primitives/Tensor2D/Tensor2DTemplateI.H   | 120 ++--
 .../primitives/Tensor2D/tensor2D/tensor2D.C   |   7 +
 29 files changed, 1249 insertions(+), 247 deletions(-)
 create mode 100644 src/foam/primitives/SymmTensor2D/SymmTensor2DTemplate.H
 create mode 100644 src/foam/primitives/SymmTensor2D/SymmTensor2DTemplateI.H
 create mode 100644 src/foam/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.C
 create mode 100644 src/foam/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.H

diff --git a/src/foam/Make/files b/src/foam/Make/files
index 8b7d803b4..6ec4ad92b 100644
--- a/src/foam/Make/files
+++ b/src/foam/Make/files
@@ -51,6 +51,7 @@ primitives/Vector/vector/vector.C
 
 primitives/Tensor2D/tensor2D/tensor2D.C
 primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.C
+primitives/SymmTensor2D/symmTensor2D/symmTensor2D.C
 primitives/Vector2D/vector2D/vector2D.C
 
 primitives/complex/complex.C
diff --git a/src/foam/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.C b/src/foam/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.C
index ca27911a9..e4cfa188f 100644
--- a/src/foam/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.C
+++ b/src/foam/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.C
@@ -58,6 +58,17 @@ dimensionedSymmTensor sqr(const dimensionedVector& dv)
 }
 
 
+dimensionedSymmTensor innerSqr(const dimensionedSymmTensor& dt)
+{
+    return dimensionedSymmTensor
+    (
+        "innerSqr("+dt.name()+')',
+        sqr(dt.dimensions()),
+        innerSqr(dt.value())
+    );
+}
+
+
 dimensionedScalar tr(const dimensionedSymmTensor& dt)
 {
     return dimensionedScalar
@@ -129,7 +140,7 @@ dimensionedSymmTensor cof(const dimensionedSymmTensor& dt)
     return dimensionedSymmTensor
     (
         "cof("+dt.name()+')',
-        dt.dimensions(),
+        pow(dt.dimensions(), symmTensor::dim - 1),
         cof(dt.value())
     );
 }
diff --git a/src/foam/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.H b/src/foam/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.H
index 1bebf4425..8feef9654 100644
--- a/src/foam/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.H
+++ b/src/foam/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.H
@@ -51,6 +51,7 @@ typedef dimensioned<symmTensor> dimensionedSymmTensor;
 // global functions
 
 dimensionedSymmTensor sqr(const dimensionedVector&);
+dimensionedSymmTensor innerSqr(const dimensionedSymmTensor&);
 
 dimensionedScalar tr(const dimensionedSymmTensor&);
 dimensionedSymmTensor symm(const dimensionedSymmTensor&);
diff --git a/src/foam/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.C b/src/foam/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.C
index 9e68adf97..0ef545a8c 100644
--- a/src/foam/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.C
+++ b/src/foam/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.C
@@ -39,6 +39,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * global operators  * * * * * * * * * * * * * //
 
 UNARY_FUNCTION(symmTensor, vector, sqr)
+UNARY_FUNCTION(symmTensor, symmTensor, innerSqr)
 
 UNARY_FUNCTION(scalar, symmTensor, tr)
 UNARY_FUNCTION(sphericalTensor, symmTensor, sph)
@@ -56,6 +57,9 @@ UNARY_FUNCTION(symmTensor, symmTensor, hinv)
 
 UNARY_OPERATOR(vector, symmTensor, *, hdual)
 
+BINARY_OPERATOR(tensor, symmTensor, symmTensor, &, dot)
+BINARY_TYPE_OPERATOR(tensor, symmTensor, symmTensor, &, dot)
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H b/src/foam/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H
index 315ad247c..722fa7e80 100644
--- a/src/foam/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H
+++ b/src/foam/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H
@@ -49,6 +49,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 UNARY_FUNCTION(symmTensor, vector, sqr)
+UNARY_FUNCTION(symmTensor, symmTensor, innerSqr)
 
 UNARY_FUNCTION(scalar, symmTensor, tr)
 UNARY_FUNCTION(sphericalTensor, symmTensor, sph)
@@ -66,6 +67,9 @@ UNARY_FUNCTION(symmTensor, symmTensor, hinv)
 
 UNARY_OPERATOR(vector, symmTensor, *, hdual)
 
+BINARY_OPERATOR(tensor, symmTensor, symmTensor, &, dot)
+BINARY_TYPE_OPERATOR(tensor, symmTensor, symmTensor, &, dot)
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/fields/Fields/symmTensorField/symmTensorField.C b/src/foam/fields/Fields/symmTensorField/symmTensorField.C
index eebf5ce0f..e1a46a4bd 100644
--- a/src/foam/fields/Fields/symmTensorField/symmTensorField.C
+++ b/src/foam/fields/Fields/symmTensorField/symmTensorField.C
@@ -38,6 +38,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * global functions  * * * * * * * * * * * * * //
 
 UNARY_FUNCTION(symmTensor, vector, sqr)
+UNARY_FUNCTION(symmTensor, symmTensor, innerSqr)
 
 UNARY_FUNCTION(scalar, symmTensor, tr)
 UNARY_FUNCTION(sphericalTensor, symmTensor, sph)
@@ -171,6 +172,9 @@ tmp<Field<symmTensor> > transformFieldMask<symmTensor>
 
 UNARY_OPERATOR(vector, symmTensor, *, hdual)
 
+BINARY_OPERATOR(tensor, symmTensor, symmTensor, &, dot)
+BINARY_TYPE_OPERATOR(tensor, symmTensor, symmTensor, &, dot)
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/fields/Fields/symmTensorField/symmTensorField.H b/src/foam/fields/Fields/symmTensorField/symmTensorField.H
index d6d75b0dc..8fb18c002 100644
--- a/src/foam/fields/Fields/symmTensorField/symmTensorField.H
+++ b/src/foam/fields/Fields/symmTensorField/symmTensorField.H
@@ -39,6 +39,7 @@ SourceFiles
 #include "vectorField.H"
 #include "sphericalTensor.H"
 #include "symmTensor.H"
+#include "tensor.H"
 
 #define TEMPLATE
 #include "FieldFunctionsM.H"
@@ -53,6 +54,7 @@ typedef Field<symmTensor> symmTensorField;
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 UNARY_FUNCTION(symmTensor, vector, sqr)
+UNARY_FUNCTION(symmTensor, symmTensor, innerSqr)
 
 UNARY_FUNCTION(scalar, symmTensor, tr)
 UNARY_FUNCTION(sphericalTensor, symmTensor, sph)
@@ -70,6 +72,9 @@ UNARY_FUNCTION(symmTensor, symmTensor, hinv)
 
 UNARY_OPERATOR(vector, symmTensor, *, hdual)
 
+BINARY_OPERATOR(tensor, symmTensor, symmTensor, &, dot)
+BINARY_TYPE_OPERATOR(tensor, symmTensor, symmTensor, &, dot)
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.C b/src/foam/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.C
index bee2173dc..f4f761c12 100644
--- a/src/foam/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.C
+++ b/src/foam/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.C
@@ -37,6 +37,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 UNARY_FUNCTION(symmTensor, vector, sqr, sqr)
+UNARY_FUNCTION(symmTensor, symmTensor, innerSqr, sqr)
 
 UNARY_FUNCTION(scalar, symmTensor, tr, transform)
 UNARY_FUNCTION(sphericalTensor, symmTensor, sph, transform)
@@ -44,8 +45,8 @@ UNARY_FUNCTION(symmTensor, symmTensor, symm, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, twoSymm, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, dev, transform)
 UNARY_FUNCTION(symmTensor, symmTensor, dev2, transform)
-UNARY_FUNCTION(scalar, symmTensor, det, transform)
-UNARY_FUNCTION(symmTensor, symmTensor, cof, cof)
+UNARY_FUNCTION(scalar, symmTensor, det, pow3)
+UNARY_FUNCTION(symmTensor, symmTensor, cof, pow2)
 UNARY_FUNCTION(symmTensor, symmTensor, inv, inv)
 UNARY_FUNCTION(symmTensor, symmTensor, hinv, hinv)
 
@@ -54,6 +55,9 @@ UNARY_FUNCTION(symmTensor, symmTensor, hinv, hinv)
 
 UNARY_OPERATOR(vector, symmTensor, *, hdual, transform)
 
+BINARY_OPERATOR(tensor, symmTensor, symmTensor, &, '&', dot)
+BINARY_TYPE_OPERATOR(tensor, symmTensor, symmTensor, &, '&', dot)
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H b/src/foam/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H
index 4c4a5ae38..9a8b78db3 100644
--- a/src/foam/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H
+++ b/src/foam/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H
@@ -48,7 +48,8 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-UNARY_FUNCTION(symmTensor, vector, sqr, transform)
+UNARY_FUNCTION(symmTensor, vector, sqr, sqr)
+UNARY_FUNCTION(symmTensor, symmTensor, innerSqr, sqr)
 
 UNARY_FUNCTION(scalar, symmTensor, tr, transform)
 UNARY_FUNCTION(sphericalTensor, symmTensor, sph, transform)
@@ -66,6 +67,10 @@ UNARY_FUNCTION(symmTensor, symmTensor, hinv, hinv)
 
 UNARY_OPERATOR(vector, symmTensor, *, hdual, transform)
 
+BINARY_OPERATOR(tensor, symmTensor, symmTensor, &, '&', dot)
+BINARY_TYPE_OPERATOR(tensor, symmTensor, symmTensor, &, '&', dot)
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/foam/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C b/src/foam/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C
index 94c311e89..3425a48fa 100644
--- a/src/foam/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C
+++ b/src/foam/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C
@@ -36,6 +36,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+UNARY_FUNCTION(tensor, tensor, T, transform)
 UNARY_FUNCTION(scalar, tensor, tr, transform)
 UNARY_FUNCTION(sphericalTensor, tensor, sph, transform)
 UNARY_FUNCTION(symmTensor, tensor, symm, transform)
@@ -43,15 +44,15 @@ UNARY_FUNCTION(symmTensor, tensor, twoSymm, transform)
 UNARY_FUNCTION(tensor, tensor, skew, transform)
 UNARY_FUNCTION(tensor, tensor, dev, transform)
 UNARY_FUNCTION(tensor, tensor, dev2, transform)
-UNARY_FUNCTION(scalar, tensor, det, transform)
-UNARY_FUNCTION(tensor, tensor, cof, cof)
+UNARY_FUNCTION(scalar, tensor, det, pow3)
+UNARY_FUNCTION(tensor, tensor, cof, pow2)
 UNARY_FUNCTION(tensor, tensor, inv, inv)
 UNARY_FUNCTION(tensor, tensor, hinv, hinv)
-UNARY_FUNCTION(vector, tensor, eigenValues, sign)
-UNARY_FUNCTION(tensor, tensor, eigenVectors, transform)
 
-UNARY_FUNCTION(vector, symmTensor, eigenValues, sign)
-UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, transform)
+UNARY_FUNCTION(vector, tensor, eigenValues, transform)
+UNARY_FUNCTION(tensor, tensor, eigenVectors, sign)
+UNARY_FUNCTION(vector, symmTensor, eigenValues, transform)
+UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, sign)
 
 
 // * * * * * * * * * * * * * * * global operators  * * * * * * * * * * * * * //
diff --git a/src/foam/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H b/src/foam/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H
index d1c9b4b00..6c21024ee 100644
--- a/src/foam/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H
+++ b/src/foam/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H
@@ -49,6 +49,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+UNARY_FUNCTION(tensor, tensor, T, transform)
 UNARY_FUNCTION(scalar, tensor, tr, transform)
 UNARY_FUNCTION(sphericalTensor, tensor, sph, transform)
 UNARY_FUNCTION(symmTensor, tensor, symm, transform)
diff --git a/src/foam/fields/GeometricFields/GeometricTensorNFields/GeometricTensorNFields.C b/src/foam/fields/GeometricFields/GeometricTensorNFields/GeometricTensorNFields.C
index 0ee0bab08..7f1171053 100644
--- a/src/foam/fields/GeometricFields/GeometricTensorNFields/GeometricTensorNFields.C
+++ b/src/foam/fields/GeometricFields/GeometricTensorNFields/GeometricTensorNFields.C
@@ -34,7 +34,7 @@ License
 #define TensorN_FieldFunctions(tensorType, diagTensorType, sphericalTensorType,     \
     vectorType, CmptType, args...)                                                  \
                                                                                     \
-UNARY_FUNCTION(tensorType, tensorType,inv,inv)                                      \
+UNARY_FUNCTION(tensorType, tensorType, T, transform)                                \
 UNARY_FUNCTION(diagTensorType, tensorType,diag,diag)                                \
 UNARY_FUNCTION(tensorType, tensorType,negSumDiag,negSumDiag)                        \
 UNARY_FUNCTION(CmptType, tensorType,contractScalar,contractScalar)                  \
diff --git a/src/foam/fields/GeometricFields/GeometricTensorNFields/GeometricTensorNFields.H b/src/foam/fields/GeometricFields/GeometricTensorNFields/GeometricTensorNFields.H
index 4793ba400..a3ff4bf16 100644
--- a/src/foam/fields/GeometricFields/GeometricTensorNFields/GeometricTensorNFields.H
+++ b/src/foam/fields/GeometricFields/GeometricTensorNFields/GeometricTensorNFields.H
@@ -47,6 +47,7 @@ SourceFiles
 #define TensorN_FieldFunctions(tensorType, diagTensorType, sphericalTensorType,     \
     vectorType, CmptType, args...)                                                  \
                                                                                     \
+UNARY_FUNCTION(tensorType, tensorType,T,transform)                                  \
 UNARY_FUNCTION(tensorType, tensorType,inv,inv)                                      \
 UNARY_FUNCTION(diagTensorType, tensorType,diag,diag)                                \
 UNARY_FUNCTION(tensorType, tensorType,negSumDiag,negSumDiag)                        \
diff --git a/src/foam/primitives/SphericalTensor/SphericalTensorTemplateI.H b/src/foam/primitives/SphericalTensor/SphericalTensorTemplateI.H
index 9cbbf0e6e..2b2f90edc 100644
--- a/src/foam/primitives/SphericalTensor/SphericalTensorTemplateI.H
+++ b/src/foam/primitives/SphericalTensor/SphericalTensorTemplateI.H
@@ -33,13 +33,13 @@ namespace Foam
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct null
-template <class Cmpt>
+template<class Cmpt>
 inline SphericalTensor<Cmpt>::SphericalTensor()
 {}
 
 
 // Construct given VectorSpace
-template <class Cmpt>
+template<class Cmpt>
 inline SphericalTensor<Cmpt>::SphericalTensor
 (
     const VectorSpace<SphericalTensor<Cmpt>, Cmpt, 1>& vs
@@ -50,7 +50,7 @@ inline SphericalTensor<Cmpt>::SphericalTensor
 
 
 // Construct given three Cmpts
-template <class Cmpt>
+template<class Cmpt>
 inline SphericalTensor<Cmpt>::SphericalTensor(const Cmpt& stii)
 {
     this->v_[II] = stii;
@@ -58,7 +58,7 @@ inline SphericalTensor<Cmpt>::SphericalTensor(const Cmpt& stii)
 
 
 // Construct from Istream
-template <class Cmpt>
+template<class Cmpt>
 inline SphericalTensor<Cmpt>::SphericalTensor(Istream& is)
 :
     VectorSpace<SphericalTensor<Cmpt>, Cmpt, 1>(is)
@@ -67,21 +67,21 @@ inline SphericalTensor<Cmpt>::SphericalTensor(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SphericalTensor<Cmpt>::ii() const
 {
     return this->v_[II];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SphericalTensor<Cmpt>::ii()
 {
     return this->v_[II];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline const SphericalTensor<Cmpt>& SphericalTensor<Cmpt>::T() const
 {
     return *this;
@@ -91,7 +91,7 @@ inline const SphericalTensor<Cmpt>& SphericalTensor<Cmpt>::T() const
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 //- Inner-product between two spherical tensors
-template <class Cmpt>
+template<class Cmpt>
 inline SphericalTensor<Cmpt>
 operator&(const SphericalTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& st2)
 {
@@ -100,7 +100,7 @@ operator&(const SphericalTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& st2)
 
 
 //- Inner-product between a spherical tensor and a vector
-template <class Cmpt>
+template<class Cmpt>
 inline Vector<Cmpt>
 operator&(const SphericalTensor<Cmpt>& st, const Vector<Cmpt>& v)
 {
@@ -114,7 +114,7 @@ operator&(const SphericalTensor<Cmpt>& st, const Vector<Cmpt>& v)
 
 
 //- Inner-product between a vector and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Vector<Cmpt>
 operator&(const Vector<Cmpt>& v, const SphericalTensor<Cmpt>& st)
 {
@@ -128,7 +128,7 @@ operator&(const Vector<Cmpt>& v, const SphericalTensor<Cmpt>& st)
 
 
 //- Double-dot-product between a spherical tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt
 operator&&(const SphericalTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& st2)
 {
@@ -137,7 +137,7 @@ operator&&(const SphericalTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& st2)
 
 
 //- Division of a scalar by a sphericalTensor
-template <class Cmpt>
+template<class Cmpt>
 inline SphericalTensor<Cmpt>
 operator/(const scalar s, const SphericalTensor<Cmpt>& st)
 {
@@ -145,7 +145,7 @@ operator/(const scalar s, const SphericalTensor<Cmpt>& st)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt magSqr(const SphericalTensor<Cmpt>& st)
 {
     return 3*magSqr(st.ii());
@@ -153,7 +153,7 @@ inline Cmpt magSqr(const SphericalTensor<Cmpt>& st)
 
 
 //- Return the trace of a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt tr(const SphericalTensor<Cmpt>& st)
 {
     return 3*st.ii();
@@ -161,7 +161,7 @@ inline Cmpt tr(const SphericalTensor<Cmpt>& st)
 
 
 //- Return the spherical part of a spherical tensor, i.e. itself
-template <class Cmpt>
+template<class Cmpt>
 inline SphericalTensor<Cmpt> sph(const SphericalTensor<Cmpt>& st)
 {
     return st;
@@ -169,7 +169,7 @@ inline SphericalTensor<Cmpt> sph(const SphericalTensor<Cmpt>& st)
 
 
 //- Return the determinant of a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt det(const SphericalTensor<Cmpt>& st)
 {
     return st.ii()*st.ii()*st.ii();
@@ -177,7 +177,7 @@ inline Cmpt det(const SphericalTensor<Cmpt>& st)
 
 
 //- Return the inverse of a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SphericalTensor<Cmpt> inv(const SphericalTensor<Cmpt>& st)
 {
     return SphericalTensor<Cmpt>(1.0/st.ii());
diff --git a/src/foam/primitives/SymmTensor/SymmTensorTemplate.H b/src/foam/primitives/SymmTensor/SymmTensorTemplate.H
index 80e9b4ca2..5d5edd498 100644
--- a/src/foam/primitives/SymmTensor/SymmTensorTemplate.H
+++ b/src/foam/primitives/SymmTensor/SymmTensorTemplate.H
@@ -50,7 +50,7 @@ namespace Foam
                            Class SymmTensor Declaration
 \*---------------------------------------------------------------------------*/
 
-template <class Cmpt>
+template<class Cmpt>
 class SymmTensor
 :
     public VectorSpace<SymmTensor<Cmpt>, Cmpt, 6>
@@ -79,6 +79,7 @@ public:
         static const SymmTensor one;
         static const SymmTensor max;
         static const SymmTensor min;
+        static const SymmTensor I;
 
 
     //- Component labeling enumeration
diff --git a/src/foam/primitives/SymmTensor/SymmTensorTemplateI.H b/src/foam/primitives/SymmTensor/SymmTensorTemplateI.H
index 0a425cf09..2801870dd 100644
--- a/src/foam/primitives/SymmTensor/SymmTensorTemplateI.H
+++ b/src/foam/primitives/SymmTensor/SymmTensorTemplateI.H
@@ -33,12 +33,12 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt>::SymmTensor()
 {}
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt>::SymmTensor
 (
     const VectorSpace<SymmTensor<Cmpt>, Cmpt, 6>& vs
@@ -48,7 +48,7 @@ inline SymmTensor<Cmpt>::SymmTensor
 {}
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt>::SymmTensor(const SphericalTensor<Cmpt>& st)
 {
     this->v_[XX] = st.ii(); this->v_[XY] = 0;       this->v_[XZ] = 0;
@@ -57,7 +57,7 @@ inline SymmTensor<Cmpt>::SymmTensor(const SphericalTensor<Cmpt>& st)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt>::SymmTensor
 (
     const Cmpt txx, const Cmpt txy, const Cmpt txz,
@@ -71,7 +71,7 @@ inline SymmTensor<Cmpt>::SymmTensor
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt>::SymmTensor(Istream& is)
 :
     VectorSpace<SymmTensor<Cmpt>, Cmpt, 6>(is)
@@ -80,81 +80,81 @@ inline SymmTensor<Cmpt>::SymmTensor(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor<Cmpt>::xx() const
 {
     return this->v_[XX];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor<Cmpt>::xy() const
 {
     return this->v_[XY];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor<Cmpt>::xz() const
 {
     return this->v_[XZ];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor<Cmpt>::yy() const
 {
     return this->v_[YY];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor<Cmpt>::yz() const
 {
     return this->v_[YZ];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor<Cmpt>::zz() const
 {
     return this->v_[ZZ];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor<Cmpt>::xx()
 {
     return this->v_[XX];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor<Cmpt>::xy()
 {
     return this->v_[XY];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor<Cmpt>::xz()
 {
     return this->v_[XZ];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor<Cmpt>::yy()
 {
     return this->v_[YY];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor<Cmpt>::yz()
 {
     return this->v_[YZ];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor<Cmpt>::zz()
 {
     return this->v_[ZZ];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline const SymmTensor<Cmpt>& SymmTensor<Cmpt>::T() const
 {
     return *this;
@@ -163,7 +163,7 @@ inline const SymmTensor<Cmpt>& SymmTensor<Cmpt>::T() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template <class Cmpt>
+template<class Cmpt>
 inline void SymmTensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
 {
     this->v_[XX] = st.ii(); this->v_[XY] = 0;       this->v_[XZ] = 0;
@@ -176,7 +176,7 @@ inline void SymmTensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 //- Hodge Dual operator (tensor -> vector)
-template <class Cmpt>
+template<class Cmpt>
 inline Vector<Cmpt> operator*(const SymmTensor<Cmpt>& st)
 {
     return Vector<Cmpt>(st.yz(), -st.xz(), st.xy());
@@ -184,7 +184,7 @@ inline Vector<Cmpt> operator*(const SymmTensor<Cmpt>& st)
 
 
 //- Inner-product between two symmetric tensors
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>
 operator&(const SymmTensor<Cmpt>& st1, const SymmTensor<Cmpt>& st2)
 {
@@ -206,7 +206,7 @@ operator&(const SymmTensor<Cmpt>& st1, const SymmTensor<Cmpt>& st2)
 
 
 //- Double-dot-product between a symmetric tensor and a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt
 operator&&(const SymmTensor<Cmpt>& st1, const SymmTensor<Cmpt>& st2)
 {
@@ -220,7 +220,7 @@ operator&&(const SymmTensor<Cmpt>& st1, const SymmTensor<Cmpt>& st2)
 
 
 //- Inner-product between a symmetric tensor and a vector
-template <class Cmpt>
+template<class Cmpt>
 inline Vector<Cmpt>
 operator&(const SymmTensor<Cmpt>& st, const Vector<Cmpt>& v)
 {
@@ -234,7 +234,7 @@ operator&(const SymmTensor<Cmpt>& st, const Vector<Cmpt>& v)
 
 
 //- Inner-product between a vector and a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Vector<Cmpt>
 operator&(const Vector<Cmpt>& v, const SymmTensor<Cmpt>& st)
 {
@@ -247,7 +247,26 @@ operator&(const Vector<Cmpt>& v, const SymmTensor<Cmpt>& st)
 }
 
 
-template <class Cmpt>
+//- Inner-sqr of a symmetric tensor
+template<class Cmpt>
+inline SymmTensor<Cmpt>
+innerSqr(const SymmTensor<Cmpt>& st)
+{
+    return SymmTensor<Cmpt>
+    (
+        st.xx()*st.xx() + st.xy()*st.xy() + st.xz()*st.xz(),
+        st.xx()*st.xy() + st.xy()*st.yy() + st.xz()*st.yz(),
+        st.xx()*st.xz() + st.xy()*st.yz() + st.xz()*st.zz(),
+
+        st.xy()*st.xy() + st.yy()*st.yy() + st.yz()*st.yz(),
+        st.xy()*st.xz() + st.yy()*st.yz() + st.yz()*st.zz(),
+
+        st.xz()*st.xz() + st.yz()*st.yz() + st.zz()*st.zz()
+    );
+}
+
+
+template<class Cmpt>
 inline Cmpt magSqr(const SymmTensor<Cmpt>& st)
 {
     return
@@ -260,7 +279,7 @@ inline Cmpt magSqr(const SymmTensor<Cmpt>& st)
 
 
 //- Return the trace of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt tr(const SymmTensor<Cmpt>& st)
 {
     return st.xx() + st.yy() + st.zz();
@@ -268,7 +287,7 @@ inline Cmpt tr(const SymmTensor<Cmpt>& st)
 
 
 //- Return the spherical part of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SphericalTensor<Cmpt> sph(const SymmTensor<Cmpt>& st)
 {
     return (1.0/3.0)*tr(st);
@@ -276,7 +295,7 @@ inline SphericalTensor<Cmpt> sph(const SymmTensor<Cmpt>& st)
 
 
 //- Return the symmetric part of a symmetric tensor, i.e. itself
-template <class Cmpt>
+template<class Cmpt>
 inline const SymmTensor<Cmpt>& symm(const SymmTensor<Cmpt>& st)
 {
     return st;
@@ -284,7 +303,7 @@ inline const SymmTensor<Cmpt>& symm(const SymmTensor<Cmpt>& st)
 
 
 //- Return twice the symmetric part of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt> twoSymm(const SymmTensor<Cmpt>& st)
 {
     return 2*st;
@@ -292,7 +311,7 @@ inline SymmTensor<Cmpt> twoSymm(const SymmTensor<Cmpt>& st)
 
 
 //- Return the deviatoric part of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt> dev(const SymmTensor<Cmpt>& st)
 {
     return st - SphericalTensor<Cmpt>::oneThirdI*tr(st);
@@ -300,7 +319,7 @@ inline SymmTensor<Cmpt> dev(const SymmTensor<Cmpt>& st)
 
 
 //- Return the deviatoric part of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt> dev2(const SymmTensor<Cmpt>& st)
 {
     return st - SphericalTensor<Cmpt>::twoThirdsI*tr(st);
@@ -308,7 +327,7 @@ inline SymmTensor<Cmpt> dev2(const SymmTensor<Cmpt>& st)
 
 
 //- Return the determinant of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt det(const SymmTensor<Cmpt>& st)
 {
     return
@@ -321,7 +340,7 @@ inline Cmpt det(const SymmTensor<Cmpt>& st)
 
 
 //- Return the cofactor symmetric tensor of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt> cof(const SymmTensor<Cmpt>& st)
 {
     return SymmTensor<Cmpt>
@@ -339,7 +358,7 @@ inline SymmTensor<Cmpt> cof(const SymmTensor<Cmpt>& st)
 
 
 //- Return the inverse of a symmetric tensor give the determinant
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st, const Cmpt detst)
 {
     return SymmTensor<Cmpt>
@@ -357,7 +376,7 @@ inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st, const Cmpt detst)
 
 
 //- Return the inverse of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st)
 {
     return inv(st, det(st));
@@ -365,7 +384,7 @@ inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st)
 
 
 //- Return the 1st invariant of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt invariantI(const SymmTensor<Cmpt>& st)
 {
     return tr(st);
@@ -373,7 +392,7 @@ inline Cmpt invariantI(const SymmTensor<Cmpt>& st)
 
 
 //- Return the 2nd invariant of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt invariantII(const SymmTensor<Cmpt>& st)
 {
     return
@@ -390,14 +409,14 @@ inline Cmpt invariantII(const SymmTensor<Cmpt>& st)
 
 
 //- Return the 3rd invariant of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt invariantIII(const SymmTensor<Cmpt>& st)
 {
     return det(st);
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt>
 operator+(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
 {
@@ -410,7 +429,7 @@ operator+(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt>
 operator+(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
 {
@@ -423,7 +442,7 @@ operator+(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt>
 operator-(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
 {
@@ -436,7 +455,7 @@ operator-(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt>
 operator-(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
 {
@@ -450,7 +469,7 @@ operator-(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
 
 
 //- Inner-product between a spherical symmetric tensor and a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt>
 operator&(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
 {
@@ -469,7 +488,7 @@ operator&(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
 
 
 //- Inner-product between a tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt>
 operator&(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
 {
@@ -488,7 +507,7 @@ operator&(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
 
 
 //- Double-dot-product between a spherical tensor and a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt
 operator&&(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
 {
@@ -497,7 +516,7 @@ operator&&(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
 
 
 //- Double-dot-product between a tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt
 operator&&(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
 {
@@ -505,7 +524,7 @@ operator&&(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt> sqr(const Vector<Cmpt>& v)
 {
     return SymmTensor<Cmpt>
diff --git a/src/foam/primitives/SymmTensor/symmTensor/symmTensor.C b/src/foam/primitives/SymmTensor/symmTensor/symmTensor.C
index be4b8bb24..a0fba83fd 100644
--- a/src/foam/primitives/SymmTensor/symmTensor/symmTensor.C
+++ b/src/foam/primitives/SymmTensor/symmTensor/symmTensor.C
@@ -75,6 +75,14 @@ const symmTensor symmTensor::min
                       -VGREAT
 );
 
+template<>
+const symmTensor symmTensor::I
+(
+    1, 0, 0,
+       1, 0,
+          1
+);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/foam/primitives/SymmTensor2D/SymmTensor2DTemplate.H b/src/foam/primitives/SymmTensor2D/SymmTensor2DTemplate.H
new file mode 100644
index 000000000..305222069
--- /dev/null
+++ b/src/foam/primitives/SymmTensor2D/SymmTensor2DTemplate.H
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM 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.
+
+    OpenFOAM 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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::SymmTensor2D
+
+Description
+    Templated 2D symmetric tensor derived from VectorSpace adding construction
+    from 4 components, element access using xx(), xy() etc. member functions
+    and the inner-product (dot-product) and outer-product of two Vectors
+    (tensor-product) operators.
+
+SourceFiles
+    SymmTensor2DTemplateI.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef SymmTensor2D_H
+#define SymmTensor2D_H
+
+#include "VectorTemplate.H"
+#include "SphericalTensor2DTemplate.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class SymmTensor2D Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Cmpt>
+class SymmTensor2D
+:
+    public VectorSpace<SymmTensor2D<Cmpt>, Cmpt, 3>
+{
+
+public:
+
+    //- Equivalent type of labels used for valid component indexing
+    typedef SymmTensor2D<label> labelType;
+
+
+    // Member constants
+
+        enum
+        {
+            rank = 2 // Rank of SymmTensor2D is 2
+        };
+
+
+    // Static data members
+
+        static const char* const typeName;
+        static const char* componentNames[];
+
+        static const SymmTensor2D zero;
+        static const SymmTensor2D one;
+        static const SymmTensor2D max;
+        static const SymmTensor2D min;
+        static const SymmTensor2D I;
+
+
+    //- Component labeling enumeration
+    enum components { XX, XY, YY };
+
+
+    // Constructors
+
+        //- Construct null
+        inline SymmTensor2D();
+
+        //- Construct given VectorSpace
+        inline SymmTensor2D(const VectorSpace<SymmTensor2D<Cmpt>, Cmpt, 3>&);
+
+        //- Construct given SphericalTensor
+        inline SymmTensor2D(const SphericalTensor2D<Cmpt>&);
+
+        //- Construct given the three components
+        inline SymmTensor2D
+        (
+            const Cmpt txx, const Cmpt txy,
+                            const Cmpt tyy
+        );
+
+        //- Construct from Istream
+        SymmTensor2D(Istream&);
+
+
+    // Member Functions
+
+        // Access
+
+            inline const Cmpt& xx() const;
+            inline const Cmpt& xy() const;
+            inline const Cmpt& yy() const;
+
+            inline Cmpt& xx();
+            inline Cmpt& xy();
+            inline Cmpt& yy();
+
+        //- Transpose
+        inline const SymmTensor2D<Cmpt>& T() const;
+
+
+    // Member Operators
+
+        //- Construct given SphericalTensor2D
+        inline void operator=(const SphericalTensor2D<Cmpt>&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Include inline implementations
+#include "SymmTensor2DTemplateI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/foam/primitives/SymmTensor2D/SymmTensor2DTemplateI.H b/src/foam/primitives/SymmTensor2D/SymmTensor2DTemplateI.H
new file mode 100644
index 000000000..a9d286dd3
--- /dev/null
+++ b/src/foam/primitives/SymmTensor2D/SymmTensor2DTemplateI.H
@@ -0,0 +1,517 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM 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.
+
+    OpenFOAM 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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "Vector2DTemplate.H"
+#include "Tensor2DTemplate.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline SymmTensor2D<Cmpt>::SymmTensor2D()
+{}
+
+
+template<class Cmpt>
+inline SymmTensor2D<Cmpt>::SymmTensor2D
+(
+    const VectorSpace<SymmTensor2D<Cmpt>, Cmpt, 3>& vs
+)
+:
+    VectorSpace<SymmTensor2D<Cmpt>, Cmpt, 3>(vs)
+{}
+
+
+template<class Cmpt>
+inline SymmTensor2D<Cmpt>::SymmTensor2D(const SphericalTensor2D<Cmpt>& st)
+{
+    this->v_[XX] = st.ii(); this->v_[XY] = 0;
+                            this->v_[YY] = st.ii();
+}
+
+
+template<class Cmpt>
+inline SymmTensor2D<Cmpt>::SymmTensor2D
+(
+    const Cmpt txx, const Cmpt txy,
+                    const Cmpt tyy
+)
+{
+    this->v_[XX] = txx; this->v_[XY] = txy;
+                        this->v_[YY] = tyy;
+}
+
+
+template<class Cmpt>
+inline SymmTensor2D<Cmpt>::SymmTensor2D(Istream& is)
+:
+    VectorSpace<SymmTensor2D<Cmpt>, Cmpt, 3>(is)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline const Cmpt& SymmTensor2D<Cmpt>::xx() const
+{
+    return this->v_[XX];
+}
+
+template<class Cmpt>
+inline const Cmpt& SymmTensor2D<Cmpt>::xy() const
+{
+    return this->v_[XY];
+}
+
+template<class Cmpt>
+inline const Cmpt& SymmTensor2D<Cmpt>::yy() const
+{
+    return this->v_[YY];
+}
+
+
+template<class Cmpt>
+inline Cmpt& SymmTensor2D<Cmpt>::xx()
+{
+    return this->v_[XX];
+}
+
+template<class Cmpt>
+inline Cmpt& SymmTensor2D<Cmpt>::xy()
+{
+    return this->v_[XY];
+}
+
+template<class Cmpt>
+inline Cmpt& SymmTensor2D<Cmpt>::yy()
+{
+    return this->v_[YY];
+}
+
+
+template<class Cmpt>
+inline const SymmTensor2D<Cmpt>& SymmTensor2D<Cmpt>::T() const
+{
+    return *this;
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Cmpt>
+inline void SymmTensor2D<Cmpt>::operator=(const SphericalTensor2D<Cmpt>& st)
+{
+    this->v_[XX] = st.ii(); this->v_[XY] = 0;
+                            this->v_[YY] = st.ii();
+}
+
+
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
+
+//- Inner-product between two symmetric tensors
+template<class Cmpt>
+inline Tensor2D<Cmpt>
+operator&(const SymmTensor2D<Cmpt>& st1, const SymmTensor2D<Cmpt>& st2)
+{
+    return Tensor2D<Cmpt>
+    (
+        st1.xx()*st2.xx() + st1.xy()*st2.xy(),
+        st1.xx()*st2.xy() + st1.xy()*st2.yy(),
+
+        st1.xy()*st2.xx() + st1.yy()*st2.xy(),
+        st1.xy()*st2.xy() + st1.yy()*st2.yy()
+    );
+}
+
+
+//- Double-dot-product between a symmetric tensor and a symmetric tensor
+template<class Cmpt>
+inline Cmpt
+operator&&(const SymmTensor2D<Cmpt>& st1, const SymmTensor2D<Cmpt>& st2)
+{
+    return
+    (
+        st1.xx()*st2.xx() + 2*st1.xy()*st2.xy()
+                          +   st1.yy()*st2.yy()
+    );
+}
+
+
+//- Inner-product between a symmetric tensor and a vector
+template<class Cmpt>
+inline Vector2D<Cmpt>
+operator&(const SymmTensor2D<Cmpt>& st, const Vector2D<Cmpt>& v)
+{
+    return Vector2D<Cmpt>
+    (
+        st.xx()*v.x() + st.xy()*v.y(),
+        st.xy()*v.x() + st.yy()*v.y()
+    );
+}
+
+
+//- Inner-product between a vector and a symmetric tensor
+template<class Cmpt>
+inline Vector2D<Cmpt>
+operator&(const Vector2D<Cmpt>& v, const SymmTensor2D<Cmpt>& st)
+{
+    return Vector2D<Cmpt>
+    (
+        v.x()*st.xx() + v.y()*st.xy(),
+        v.x()*st.xy() + v.y()*st.yy()
+    );
+}
+
+
+//- Inner-sqr of a symmetric tensor
+template<class Cmpt>
+inline SymmTensor2D<Cmpt>
+innerSqr(const SymmTensor2D<Cmpt>& st)
+{
+    return SymmTensor2D<Cmpt>
+    (
+        st.xx()*st.xx() + st.xy()*st.xy(),
+        st.xx()*st.xy() + st.xy()*st.yy(),
+        st.xy()*st.xy() + st.yy()*st.yy()
+    );
+}
+
+
+template<class Cmpt>
+inline Cmpt magSqr(const SymmTensor2D<Cmpt>& st)
+{
+    return
+    (
+        magSqr(st.xx()) + 2*magSqr(st.xy())
+                        +   magSqr(st.yy())
+    );
+}
+
+
+//- Return the trace of a symmetric tensor
+template<class Cmpt>
+inline Cmpt tr(const SymmTensor2D<Cmpt>& st)
+{
+    return st.xx() + st.yy();
+}
+
+
+//- Return the spherical part of a symmetric tensor
+template<class Cmpt>
+inline SphericalTensor2D<Cmpt> sph(const SymmTensor2D<Cmpt>& st)
+{
+    return (1.0/2.0)*tr(st);
+}
+
+
+//- Return the symmetric part of a symmetric tensor, i.e. itself
+template<class Cmpt>
+inline const SymmTensor2D<Cmpt>& symm(const SymmTensor2D<Cmpt>& st)
+{
+    return st;
+}
+
+
+//- Return twice the symmetric part of a symmetric tensor
+template<class Cmpt>
+inline SymmTensor2D<Cmpt> twoSymm(const SymmTensor2D<Cmpt>& st)
+{
+    return 2*st;
+}
+
+
+//- Return the deviatoric part of a symmetric tensor
+template<class Cmpt>
+inline SymmTensor2D<Cmpt> dev(const SymmTensor2D<Cmpt>& st)
+{
+    return st - SphericalTensor2D<Cmpt>::oneThirdI*tr(st);
+}
+
+
+//- Return the deviatoric part of a symmetric tensor
+template<class Cmpt>
+inline SymmTensor2D<Cmpt> dev2(const SymmTensor2D<Cmpt>& st)
+{
+    return st - SphericalTensor2D<Cmpt>::twoThirdsI*tr(st);
+}
+
+
+//- Return the determinant of a symmetric tensor
+template<class Cmpt>
+inline Cmpt det(const SymmTensor2D<Cmpt>& st)
+{
+    return
+    (
+        st.xx()*st.yy() - st.xy()*st.xy()
+    );
+}
+
+
+//- Return the cofactor symmetric tensor of a symmetric tensor
+template<class Cmpt>
+inline SymmTensor2D<Cmpt> cof(const SymmTensor2D<Cmpt>& st)
+{
+    return SymmTensor2D<Cmpt>
+    (
+        st.yy(), -st.xy(),
+                  st.xx()
+    );
+}
+
+
+//- Return the inverse of a symmetric tensor give the determinant
+template<class Cmpt>
+inline SymmTensor2D<Cmpt> inv(const SymmTensor2D<Cmpt>& st, const Cmpt detst)
+{
+    return cof(st)/detst;
+}
+
+
+//- Return the inverse of a symmetric tensor
+template<class Cmpt>
+inline SymmTensor2D<Cmpt> inv(const SymmTensor2D<Cmpt>& st)
+{
+    return inv(st, det(st));
+}
+
+
+//- Return the 1st invariant of a symmetric tensor
+template<class Cmpt>
+inline Cmpt invariantI(const SymmTensor2D<Cmpt>& st)
+{
+    return tr(st);
+}
+
+
+//- Return the 2nd invariant of a symmetric tensor
+template<class Cmpt>
+inline Cmpt invariantII(const SymmTensor2D<Cmpt>& st)
+{
+    return
+    (
+        0.5*sqr(tr(st))
+      - 0.5*
+        (
+           st.xx()*st.xx() + st.xy()*st.xy()
+         + st.xy()*st.xy() + st.yy()*st.yy()
+        )
+    );
+}
+
+
+//- Return the 3rd invariant of a symmetric tensor
+template<class Cmpt>
+inline Cmpt invariantIII(const SymmTensor2D<Cmpt>& st)
+{
+    return det(st);
+}
+
+
+template<class Cmpt>
+inline SymmTensor2D<Cmpt>
+operator+(const SphericalTensor2D<Cmpt>& spt1, const SymmTensor2D<Cmpt>& st2)
+{
+    return SymmTensor2D<Cmpt>
+    (
+        spt1.ii() + st2.xx(), st2.xy(),
+                              spt1.ii() + st2.yy()
+    );
+}
+
+
+template<class Cmpt>
+inline SymmTensor2D<Cmpt>
+operator+(const SymmTensor2D<Cmpt>& st1, const SphericalTensor2D<Cmpt>& spt2)
+{
+    return SymmTensor2D<Cmpt>
+    (
+        st1.xx() + spt2.ii(), st1.xy(),
+                              st1.yy() + spt2.ii()
+    );
+}
+
+
+template<class Cmpt>
+inline SymmTensor2D<Cmpt>
+operator-(const SphericalTensor2D<Cmpt>& spt1, const SymmTensor2D<Cmpt>& st2)
+{
+    return SymmTensor2D<Cmpt>
+    (
+        spt1.ii() - st2.xx(), -st2.xy(),
+                               spt1.ii() - st2.yy()
+    );
+}
+
+
+template<class Cmpt>
+inline SymmTensor2D<Cmpt>
+operator-(const SymmTensor2D<Cmpt>& st1, const SphericalTensor2D<Cmpt>& spt2)
+{
+    return SymmTensor2D<Cmpt>
+    (
+        st1.xx() - spt2.ii(), st1.xy(),
+                              st1.yy() - spt2.ii()
+    );
+}
+
+
+//- Inner-product between a spherical symmetric tensor and a symmetric tensor
+template<class Cmpt>
+inline SymmTensor2D<Cmpt>
+operator&(const SphericalTensor2D<Cmpt>& spt1, const SymmTensor2D<Cmpt>& st2)
+{
+    return SymmTensor2D<Cmpt>
+    (
+        spt1.ii()*st2.xx(), spt1.ii()*st2.xy(),
+                            spt1.ii()*st2.yy()
+    );
+}
+
+
+//- Inner-product between a tensor and a spherical tensor
+template<class Cmpt>
+inline SymmTensor2D<Cmpt>
+operator&(const SymmTensor2D<Cmpt>& st1, const SphericalTensor2D<Cmpt>& spt2)
+{
+    return SymmTensor2D<Cmpt>
+    (
+        st1.xx()*spt2.ii(), st1.xy()*spt2.ii(),
+                            st1.yy()*spt2.ii()
+    );
+}
+
+
+//- Double-dot-product between a spherical tensor and a symmetric tensor
+template<class Cmpt>
+inline Cmpt
+operator&&(const SphericalTensor2D<Cmpt>& spt1, const SymmTensor2D<Cmpt>& st2)
+{
+    return(spt1.ii()*st2.xx() + spt1.ii()*st2.yy());
+}
+
+
+//- Double-dot-product between a tensor and a spherical tensor
+template<class Cmpt>
+inline Cmpt
+operator&&(const SymmTensor2D<Cmpt>& st1, const SphericalTensor2D<Cmpt>& spt2)
+{
+    return(st1.xx()*spt2.ii() + st1.yy()*spt2.ii());
+}
+
+
+template<class Cmpt>
+inline SymmTensor2D<Cmpt> sqr(const Vector2D<Cmpt>& v)
+{
+    return SymmTensor2D<Cmpt>
+    (
+        v.x()*v.x(), v.x()*v.y(),
+                     v.y()*v.y()
+    );
+}
+
+
+template<class Cmpt>
+class outerProduct<SymmTensor2D<Cmpt>, Cmpt>
+{
+public:
+
+    typedef SymmTensor2D<Cmpt> type;
+};
+
+template<class Cmpt>
+class outerProduct<Cmpt, SymmTensor2D<Cmpt> >
+{
+public:
+
+    typedef SymmTensor2D<Cmpt> type;
+};
+
+template<class Cmpt>
+class innerProduct<SymmTensor2D<Cmpt>, SymmTensor2D<Cmpt> >
+{
+public:
+
+    typedef Tensor2D<Cmpt> type;
+};
+
+template<class Cmpt>
+class innerProduct<SymmTensor2D<Cmpt>, Vector2D<Cmpt> >
+{
+public:
+
+    typedef Vector2D<Cmpt> type;
+};
+
+template<class Cmpt>
+class innerProduct<Vector2D<Cmpt>, SymmTensor2D<Cmpt> >
+{
+public:
+
+    typedef Vector2D<Cmpt> type;
+};
+
+
+template<class Cmpt>
+class typeOfSum<SphericalTensor2D<Cmpt>, SymmTensor2D<Cmpt> >
+{
+public:
+
+    typedef SymmTensor2D<Cmpt> type;
+};
+
+template<class Cmpt>
+class typeOfSum<SymmTensor2D<Cmpt>, SphericalTensor2D<Cmpt> >
+{
+public:
+
+    typedef SymmTensor2D<Cmpt> type;
+};
+
+template<class Cmpt>
+class innerProduct<SphericalTensor2D<Cmpt>, SymmTensor2D<Cmpt> >
+{
+public:
+
+    typedef SymmTensor2D<Cmpt> type;
+};
+
+template<class Cmpt>
+class innerProduct<SymmTensor2D<Cmpt>, SphericalTensor2D<Cmpt> >
+{
+public:
+
+    typedef SymmTensor2D<Cmpt> type;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/foam/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.C b/src/foam/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.C
new file mode 100644
index 000000000..32f6d9ca6
--- /dev/null
+++ b/src/foam/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.C
@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM 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.
+
+    OpenFOAM 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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "symmTensor2D.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<>
+const char* const symmTensor2D::typeName = "symmTensor2D";
+
+template<>
+const char* symmTensor2D::componentNames[] =
+{
+    "xx", "xy",
+          "yy"
+};
+
+template<>
+const symmTensor2D symmTensor2D::zero
+(
+    0, 0,
+       0
+);
+
+template<>
+const symmTensor2D symmTensor2D::one
+(
+    1, 1,
+       1
+);
+
+template<>
+const symmTensor2D symmTensor2D::max
+(
+    VGREAT, VGREAT,
+            VGREAT
+);
+
+template<>
+const symmTensor2D symmTensor2D::min
+(
+    -VGREAT, -VGREAT,
+             -VGREAT
+);
+
+template<>
+const symmTensor2D symmTensor2D::I
+(
+    1, 0,
+       1
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/foam/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.H b/src/foam/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.H
new file mode 100644
index 000000000..fde41c60a
--- /dev/null
+++ b/src/foam/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.H
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM 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.
+
+    OpenFOAM 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 OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::symmTensor2D
+
+Description
+    SymmTensor2D of scalars.
+
+SourceFiles
+    symmTensor2D.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef symmTensor2D_H
+#define symmTensor2D_H
+
+#include "SymmTensor2DTemplate.H"
+#include "contiguous.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+typedef SymmTensor2D<scalar> symmTensor2D;
+
+//- Data associated with symmTensor2D type are contiguous
+template<>
+inline bool contiguous<symmTensor2D>() {return true;}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderTemplate.H b/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderTemplate.H
index 73e6799bd..a1c24eb05 100644
--- a/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderTemplate.H
+++ b/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderTemplate.H
@@ -66,7 +66,7 @@ namespace Foam
                        Class SymmTensor4thOrder Declaration
 \*---------------------------------------------------------------------------*/
 
-template <class Cmpt>
+template<class Cmpt>
 class SymmTensor4thOrder
 :
     public VectorSpace<SymmTensor4thOrder<Cmpt>, Cmpt, 9>
diff --git a/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderTemplateI.H b/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderTemplateI.H
index 52cb14eb8..b9c0f86da 100644
--- a/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderTemplateI.H
+++ b/src/foam/primitives/SymmTensor4thOrder/SymmTensor4thOrderTemplateI.H
@@ -34,13 +34,13 @@ namespace Foam
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct null
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor4thOrder<Cmpt>::SymmTensor4thOrder()
 {}
 
 
 // Construct given VectorSpace
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor4thOrder<Cmpt>::SymmTensor4thOrder
 (
     const VectorSpace<SymmTensor4thOrder<Cmpt>, Cmpt, 9>& vs
@@ -51,7 +51,7 @@ inline SymmTensor4thOrder<Cmpt>::SymmTensor4thOrder
 
 
 // Construct given three Cmpts
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor4thOrder<Cmpt>::SymmTensor4thOrder
 (
  const Cmpt txxxx, const Cmpt txxyy, const Cmpt txxzz,
@@ -72,7 +72,7 @@ inline SymmTensor4thOrder<Cmpt>::SymmTensor4thOrder
 
 
 // Construct from Istream
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor4thOrder<Cmpt>::SymmTensor4thOrder(Istream& is)
 :
     VectorSpace<SymmTensor4thOrder<Cmpt>, Cmpt, 9>(is)
@@ -81,110 +81,110 @@ inline SymmTensor4thOrder<Cmpt>::SymmTensor4thOrder(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor4thOrder<Cmpt>::xxxx() const
 {
     return this->v_[XXXX];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor4thOrder<Cmpt>::xxyy() const
 {
     return this->v_[XXYY];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor4thOrder<Cmpt>::xxzz() const
 {
     return this->v_[XXZZ];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor4thOrder<Cmpt>::yyyy() const
 {
     return this->v_[YYYY];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor4thOrder<Cmpt>::yyzz() const
 {
     return this->v_[YYZZ];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor4thOrder<Cmpt>::zzzz() const
 {
     return this->v_[ZZZZ];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor4thOrder<Cmpt>::xyxy() const
 {
     return this->v_[XYXY];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor4thOrder<Cmpt>::yzyz() const
 {
     return this->v_[YZYZ];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  SymmTensor4thOrder<Cmpt>::zxzx() const
 {
     return this->v_[ZXZX];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor4thOrder<Cmpt>::xxxx()
 {
     return this->v_[XXXX];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor4thOrder<Cmpt>::xxyy()
 {
     return this->v_[XXYY];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor4thOrder<Cmpt>::xxzz()
 {
     return this->v_[XXZZ];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor4thOrder<Cmpt>::yyyy()
 {
     return this->v_[YYYY];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor4thOrder<Cmpt>::yyzz()
 {
     return this->v_[YYZZ];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor4thOrder<Cmpt>::zzzz()
 {
     return this->v_[ZZZZ];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor4thOrder<Cmpt>::xyxy()
 {
     return this->v_[XYXY];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor4thOrder<Cmpt>::yzyz()
 {
     return this->v_[YZYZ];
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& SymmTensor4thOrder<Cmpt>::zxzx()
 {
     return this->v_[ZXZX];
@@ -196,7 +196,7 @@ inline Cmpt& SymmTensor4thOrder<Cmpt>::zxzx()
 
 //- Double-dot-product between a fourth order symmetric tensor and
 //  a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt>
 operator&&(const SymmTensor4thOrder<Cmpt>& t4th, const SymmTensor<Cmpt>& st)
 {
@@ -216,7 +216,7 @@ operator&&(const SymmTensor4thOrder<Cmpt>& t4th, const SymmTensor<Cmpt>& st)
 
 //- Double-dot-product between a symmetric tensor and a symmetric
 //  fourth order tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt>
 operator&&(const SymmTensor<Cmpt>& st, const SymmTensor4thOrder<Cmpt>& t4th)
 {
@@ -238,7 +238,7 @@ operator&&(const SymmTensor<Cmpt>& st, const SymmTensor4thOrder<Cmpt>& t4th)
 
 //- Inner-product between a symmTensor4thOrder and a vector
 //  this is not implemented
-template <class Cmpt>
+template<class Cmpt>
 inline Vector<Cmpt>
 operator&(const SymmTensor4thOrder<Cmpt>& st, const Vector<Cmpt>& v)
 {
@@ -259,7 +259,7 @@ operator&(const SymmTensor4thOrder<Cmpt>& st, const Vector<Cmpt>& v)
 
 //- Inner-product between a vector and a symmTensor4thOrder
 //  this is not implemented
-template <class Cmpt>
+template<class Cmpt>
 inline Vector<Cmpt>
 operator&(const Vector<Cmpt>& v, const SymmTensor4thOrder<Cmpt>& st)
 {
diff --git a/src/foam/primitives/Tensor/TensorTemplate.H b/src/foam/primitives/Tensor/TensorTemplate.H
index c2d90607a..db81c87d4 100644
--- a/src/foam/primitives/Tensor/TensorTemplate.H
+++ b/src/foam/primitives/Tensor/TensorTemplate.H
@@ -53,7 +53,7 @@ class SymmTensor;
                            Class Tensor Declaration
 \*---------------------------------------------------------------------------*/
 
-template <class Cmpt>
+template<class Cmpt>
 class Tensor
 :
     public VectorSpace<Tensor<Cmpt>, Cmpt, 9>
@@ -82,6 +82,7 @@ public:
         static const Tensor one;
         static const Tensor max;
         static const Tensor min;
+        static const Tensor I;
 
 
     //- Component labeling enumeration
@@ -93,7 +94,7 @@ public:
         //- Construct null
         inline Tensor();
 
-        //- Construct given VectorSpace
+        //- Construct given VectorSpace of the same rank
         inline Tensor(const VectorSpace<Tensor<Cmpt>, Cmpt, 9>&);
 
         //- Construct given SphericalTensor
@@ -102,7 +103,10 @@ public:
         //- Construct given SymmTensor
         inline Tensor(const SymmTensor<Cmpt>&);
 
-        //- Construct given the three vectors
+        //- Construct given triad
+        inline Tensor(const Vector<Vector<Cmpt> >&);
+
+        //- Construct given the three vector components
         inline Tensor
         (
             const Vector<Cmpt>& x,
@@ -149,9 +153,10 @@ public:
             // Access vector components.
             // Note: returning const only to find out lhs usage
 
-            inline const Vector<Cmpt> x() const;
-            inline const Vector<Cmpt> y() const;
-            inline const Vector<Cmpt> z() const;
+            inline Vector<Cmpt> x() const;
+            inline Vector<Cmpt> y() const;
+            inline Vector<Cmpt> z() const;
+            inline Vector<Cmpt> vectorComponent(const direction) const;
 
             //- Return (i, j) component.  Consistency with VectorN
             inline const Cmpt& operator()
@@ -179,6 +184,9 @@ public:
 
         //- Assign to a SymmTensor
         inline void operator=(const SymmTensor<Cmpt>&);
+
+        //- Assign to a triad
+        inline void operator=(const Vector<Vector<Cmpt> >&);
 };
 
 
diff --git a/src/foam/primitives/Tensor/TensorTemplateI.H b/src/foam/primitives/Tensor/TensorTemplateI.H
index 4e7849f8e..2b254bd84 100644
--- a/src/foam/primitives/Tensor/TensorTemplateI.H
+++ b/src/foam/primitives/Tensor/TensorTemplateI.H
@@ -33,13 +33,13 @@ namespace Foam
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 //- Construct null
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>::Tensor()
 {}
 
 
 //- Construct given VectorSpace
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>::Tensor(const VectorSpace<Tensor<Cmpt>, Cmpt, 9>& vs)
 :
     VectorSpace<Tensor<Cmpt>, Cmpt, 9>(vs)
@@ -47,7 +47,7 @@ inline Tensor<Cmpt>::Tensor(const VectorSpace<Tensor<Cmpt>, Cmpt, 9>& vs)
 
 
 //- Construct given SphericalTensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>::Tensor(const SphericalTensor<Cmpt>& st)
 {
     this->v_[XX] = st.ii(); this->v_[XY] = 0; this->v_[XZ] = 0;
@@ -57,7 +57,7 @@ inline Tensor<Cmpt>::Tensor(const SphericalTensor<Cmpt>& st)
 
 
 //- Construct given SymmTensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>::Tensor(const SymmTensor<Cmpt>& st)
 {
     this->v_[XX] = st.xx(); this->v_[XY] = st.xy(); this->v_[XZ] = st.xz();
@@ -66,8 +66,26 @@ inline Tensor<Cmpt>::Tensor(const SymmTensor<Cmpt>& st)
 }
 
 
+//- Construct from a triad
+template<class Cmpt>
+inline Tensor<Cmpt>::Tensor(const Vector<Vector<Cmpt> >& tr)
+{
+    this->v_[XX] = tr.x().x();
+    this->v_[XY] = tr.x().y();
+    this->v_[XZ] = tr.x().z();
+
+    this->v_[YX] = tr.y().x();
+    this->v_[YY] = tr.y().y();
+    this->v_[YZ] = tr.y().z();
+
+    this->v_[ZX] = tr.z().x();
+    this->v_[ZY] = tr.z().y();
+    this->v_[ZZ] = tr.z().z();
+}
+
+
 //- Construct given the three vector components
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>::Tensor
 (
     const Vector<Cmpt>& x,
@@ -82,7 +100,7 @@ inline Tensor<Cmpt>::Tensor
 
 
 //- Construct from components
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>::Tensor
 (
     const Cmpt txx, const Cmpt txy, const Cmpt txz,
@@ -97,7 +115,7 @@ inline Tensor<Cmpt>::Tensor
 
 
 //- Construct from Istream
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>::Tensor(Istream& is)
 :
     VectorSpace<Tensor<Cmpt>, Cmpt, 9>(is)
@@ -106,133 +124,165 @@ inline Tensor<Cmpt>::Tensor(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template <class Cmpt>
-inline const Vector<Cmpt> Tensor<Cmpt>::x() const
+template<class Cmpt>
+inline Vector<Cmpt> Tensor<Cmpt>::x() const
 {
     return Vector<Cmpt>(this->v_[XX], this->v_[XY], this->v_[XZ]);
 }
 
-template <class Cmpt>
-inline const Vector<Cmpt> Tensor<Cmpt>::y() const
+
+template<class Cmpt>
+inline Vector<Cmpt> Tensor<Cmpt>::y() const
 {
     return Vector<Cmpt>(this->v_[YX], this->v_[YY], this->v_[YZ]);
 }
 
-template <class Cmpt>
-inline const Vector<Cmpt> Tensor<Cmpt>::z() const
+
+template<class Cmpt>
+inline Vector<Cmpt>  Tensor<Cmpt>::z() const
 {
     return Vector<Cmpt>(this->v_[ZX], this->v_[ZY], this->v_[ZZ]);
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
+inline Vector<Cmpt>  Tensor<Cmpt>::vectorComponent(const direction cmpt) const
+{
+    switch (cmpt)
+    {
+        case 0:
+            return x();
+        break;
+        case 1:
+            return y();
+        break;
+        case 2:
+            return z();
+        break;
+    }
+}
+
+
+template<class Cmpt>
 inline const Cmpt&  Tensor<Cmpt>::xx() const
 {
     return this->v_[XX];
 }
 
-template <class Cmpt>
+
+template<class Cmpt>
 inline const Cmpt&  Tensor<Cmpt>::xy() const
 {
     return this->v_[XY];
 }
 
-template <class Cmpt>
+
+template<class Cmpt>
 inline const Cmpt&  Tensor<Cmpt>::xz() const
 {
     return this->v_[XZ];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  Tensor<Cmpt>::yx() const
 {
     return this->v_[YX];
 }
 
-template <class Cmpt>
+
+template<class Cmpt>
 inline const Cmpt&  Tensor<Cmpt>::yy() const
 {
     return this->v_[YY];
 }
 
-template <class Cmpt>
+
+template<class Cmpt>
 inline const Cmpt&  Tensor<Cmpt>::yz() const
 {
     return this->v_[YZ];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt&  Tensor<Cmpt>::zx() const
 {
     return this->v_[ZX];
 }
 
-template <class Cmpt>
+
+template<class Cmpt>
 inline const Cmpt&  Tensor<Cmpt>::zy() const
 {
     return this->v_[ZY];
 }
 
-template <class Cmpt>
+
+template<class Cmpt>
 inline const Cmpt&  Tensor<Cmpt>::zz() const
 {
     return this->v_[ZZ];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& Tensor<Cmpt>::xx()
 {
     return this->v_[XX];
 }
 
-template <class Cmpt>
+
+template<class Cmpt>
 inline Cmpt& Tensor<Cmpt>::xy()
 {
     return this->v_[XY];
 }
 
-template <class Cmpt>
+
+template<class Cmpt>
 inline Cmpt& Tensor<Cmpt>::xz()
 {
     return this->v_[XZ];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& Tensor<Cmpt>::yx()
 {
     return this->v_[YX];
 }
 
-template <class Cmpt>
+
+template<class Cmpt>
 inline Cmpt& Tensor<Cmpt>::yy()
 {
     return this->v_[YY];
 }
 
-template <class Cmpt>
+
+template<class Cmpt>
 inline Cmpt& Tensor<Cmpt>::yz()
 {
     return this->v_[YZ];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& Tensor<Cmpt>::zx()
 {
     return this->v_[ZX];
 }
 
-template <class Cmpt>
+
+template<class Cmpt>
 inline Cmpt& Tensor<Cmpt>::zy()
 {
     return this->v_[ZY];
 }
 
-template <class Cmpt>
+
+template<class Cmpt>
 inline Cmpt& Tensor<Cmpt>::zz()
 {
     return this->v_[ZZ];
@@ -240,7 +290,7 @@ inline Cmpt& Tensor<Cmpt>::zz()
 
 
 //- Return tensor transpose
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt> Tensor<Cmpt>::T() const
 {
     return Tensor<Cmpt>
@@ -252,7 +302,7 @@ inline Tensor<Cmpt> Tensor<Cmpt>::T() const
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt& Tensor<Cmpt>::operator()
 (
     const direction i,
@@ -263,7 +313,7 @@ inline const Cmpt& Tensor<Cmpt>::operator()
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& Tensor<Cmpt>::operator()
 (
     const direction i,
@@ -276,7 +326,7 @@ inline Cmpt& Tensor<Cmpt>::operator()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template <class Cmpt>
+template<class Cmpt>
 inline void Tensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
 {
     this->v_[XX] = st.ii(); this->v_[XY] = 0; this->v_[XZ] = 0;
@@ -285,7 +335,7 @@ inline void Tensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline void Tensor<Cmpt>::operator=(const SymmTensor<Cmpt>& st)
 {
     this->v_[XX] = st.xx(); this->v_[XY] = st.xy(); this->v_[XZ] = st.xz();
@@ -294,10 +344,27 @@ inline void Tensor<Cmpt>::operator=(const SymmTensor<Cmpt>& st)
 }
 
 
+template<class Cmpt>
+inline void Tensor<Cmpt>::operator=(const Vector<Vector<Cmpt> >& tr)
+{
+    this->v_[XX] = tr.x().x();
+    this->v_[XY] = tr.x().y();
+    this->v_[XZ] = tr.x().z();
+
+    this->v_[YX] = tr.y().x();
+    this->v_[YY] = tr.y().y();
+    this->v_[YZ] = tr.y().z();
+
+    this->v_[ZX] = tr.z().x();
+    this->v_[ZY] = tr.z().y();
+    this->v_[ZZ] = tr.z().z();
+}
+
+
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 //- Hodge Dual operator (tensor -> vector)
-template <class Cmpt>
+template<class Cmpt>
 inline Vector<Cmpt> operator*(const Tensor<Cmpt>& t)
 {
     return Vector<Cmpt>(t.yz(), -t.xz(), t.xy());
@@ -305,7 +372,7 @@ inline Vector<Cmpt> operator*(const Tensor<Cmpt>& t)
 
 
 //- Hodge Dual operator (vector -> tensor)
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt> operator*(const Vector<Cmpt>& v)
 {
     return Tensor<Cmpt>
@@ -318,7 +385,7 @@ inline Tensor<Cmpt> operator*(const Vector<Cmpt>& v)
 
 
 //- Inner-product between two tensors
-template <class Cmpt>
+template<class Cmpt>
 inline typename innerProduct<Tensor<Cmpt>, Tensor<Cmpt> >::type
 operator&(const Tensor<Cmpt>& t1, const Tensor<Cmpt>& t2)
 {
@@ -340,7 +407,7 @@ operator&(const Tensor<Cmpt>& t1, const Tensor<Cmpt>& t2)
 
 
 //- Inner-product between a tensor and a vector
-template <class Cmpt>
+template<class Cmpt>
 inline typename innerProduct<Tensor<Cmpt>, Vector<Cmpt> >::type
 operator&(const Tensor<Cmpt>& t, const Vector<Cmpt>& v)
 {
@@ -354,7 +421,7 @@ operator&(const Tensor<Cmpt>& t, const Vector<Cmpt>& v)
 
 
 //- Inner-product between a vector and a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline typename innerProduct<Vector<Cmpt>, Tensor<Cmpt> >::type
 operator&(const Vector<Cmpt>& v, const Tensor<Cmpt>& t)
 {
@@ -368,7 +435,7 @@ operator&(const Vector<Cmpt>& v, const Tensor<Cmpt>& t)
 
 
 //- Outer-product between two vectors
-template <class Cmpt>
+template<class Cmpt>
 inline typename outerProduct<Vector<Cmpt>, Vector<Cmpt> >::type
 operator*(const Vector<Cmpt>& v1, const Vector<Cmpt>& v2)
 {
@@ -382,7 +449,7 @@ operator*(const Vector<Cmpt>& v1, const Vector<Cmpt>& v2)
 
 
 //- Division of a vector by a tensor, i.e. dot-product with the tensor inverse
-template <class Cmpt>
+template<class Cmpt>
 inline typename innerProduct<Vector<Cmpt>, Tensor<Cmpt> >::type
 operator/(const Vector<Cmpt>& v, const Tensor<Cmpt>& t)
 {
@@ -393,7 +460,7 @@ operator/(const Vector<Cmpt>& v, const Tensor<Cmpt>& t)
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 //- Return the trace of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt tr(const Tensor<Cmpt>& t)
 {
     return t.xx() + t.yy() + t.zz();
@@ -401,7 +468,7 @@ inline Cmpt tr(const Tensor<Cmpt>& t)
 
 
 //- Return the spherical part of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SphericalTensor<Cmpt> sph(const Tensor<Cmpt>& t)
 {
     return (1.0/3.0)*tr(t);
@@ -409,7 +476,7 @@ inline SphericalTensor<Cmpt> sph(const Tensor<Cmpt>& t)
 
 
 //- Return the symmetric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt> symm(const Tensor<Cmpt>& t)
 {
     return SymmTensor<Cmpt>
@@ -422,7 +489,7 @@ inline SymmTensor<Cmpt> symm(const Tensor<Cmpt>& t)
 
 
 //- Return twice the symmetric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SymmTensor<Cmpt> twoSymm(const Tensor<Cmpt>& t)
 {
     return SymmTensor<Cmpt>
@@ -435,7 +502,7 @@ inline SymmTensor<Cmpt> twoSymm(const Tensor<Cmpt>& t)
 
 
 //- Return the skew-symmetric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt> skew(const Tensor<Cmpt>& t)
 {
     return Tensor<Cmpt>
@@ -448,7 +515,7 @@ inline Tensor<Cmpt> skew(const Tensor<Cmpt>& t)
 
 
 //- Return the skew-symmetric part of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
 inline const Tensor<Cmpt>& skew(const SymmTensor<Cmpt>& st)
 {
     return Tensor<Cmpt>::zero;
@@ -456,7 +523,7 @@ inline const Tensor<Cmpt>& skew(const SymmTensor<Cmpt>& st)
 
 
 //- Return the deviatoric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt> dev(const Tensor<Cmpt>& t)
 {
     return t - SphericalTensor<Cmpt>::oneThirdI*tr(t);
@@ -464,7 +531,7 @@ inline Tensor<Cmpt> dev(const Tensor<Cmpt>& t)
 
 
 //- Return the deviatoric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt> dev2(const Tensor<Cmpt>& t)
 {
     return t - SphericalTensor<Cmpt>::twoThirdsI*tr(t);
@@ -472,7 +539,7 @@ inline Tensor<Cmpt> dev2(const Tensor<Cmpt>& t)
 
 
 //- Return the determinant of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt det(const Tensor<Cmpt>& t)
 {
     return
@@ -485,7 +552,7 @@ inline Cmpt det(const Tensor<Cmpt>& t)
 
 
 //- Return the cofactor tensor of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt> cof(const Tensor<Cmpt>& t)
 {
     return Tensor<Cmpt>
@@ -505,8 +572,8 @@ inline Tensor<Cmpt> cof(const Tensor<Cmpt>& t)
 }
 
 
-//- Return the inverse of a tensor give the determinant
-template <class Cmpt>
+//- Return the inverse of a tensor given the determinant
+template<class Cmpt>
 inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t, const Cmpt dett)
 {
     return Tensor<Cmpt>
@@ -527,7 +594,7 @@ inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t, const Cmpt dett)
 
 
 //- Return the inverse of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t)
 {
     return inv(t, det(t));
@@ -535,7 +602,7 @@ inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t)
 
 
 //- Return the 1st invariant of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt invariantI(const Tensor<Cmpt>& t)
 {
     return tr(t);
@@ -543,7 +610,7 @@ inline Cmpt invariantI(const Tensor<Cmpt>& t)
 
 
 //- Return the 2nd invariant of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt invariantII(const Tensor<Cmpt>& t)
 {
     return
@@ -560,7 +627,7 @@ inline Cmpt invariantII(const Tensor<Cmpt>& t)
 
 
 //- Return the 3rd invariant of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt invariantIII(const Tensor<Cmpt>& t)
 {
     return det(t);
@@ -569,7 +636,7 @@ inline Cmpt invariantIII(const Tensor<Cmpt>& t)
 
 // * * * * * * * * * Mixed Tensor SphericalTensor Operators  * * * * * * * * //
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>
 operator+(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 {
@@ -582,7 +649,7 @@ operator+(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>
 operator+(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
 {
@@ -595,7 +662,7 @@ operator+(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>
 operator-(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 {
@@ -608,7 +675,7 @@ operator-(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>
 operator-(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
 {
@@ -622,7 +689,7 @@ operator-(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
 
 
 //- Inner-product between a spherical tensor and a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>
 operator&(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 {
@@ -644,7 +711,7 @@ operator&(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 
 
 //- Inner-product between a tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>
 operator&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
 {
@@ -666,7 +733,7 @@ operator&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
 
 
 //- Double-dot-product between a spherical tensor and a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt
 operator&&(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 {
@@ -675,13 +742,14 @@ operator&&(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 
 
 //- Double-dot-product between a tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt
 operator&&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
 {
     return(t1.xx()*st2.ii() + t1.yy()*st2.ii() + t1.zz()*st2.ii());
 }
 
+
 template<class Cmpt>
 class typeOfSum<SphericalTensor<Cmpt>, Tensor<Cmpt> >
 {
@@ -690,6 +758,7 @@ public:
     typedef Tensor<Cmpt> type;
 };
 
+
 template<class Cmpt>
 class typeOfSum<Tensor<Cmpt>, SphericalTensor<Cmpt> >
 {
@@ -698,6 +767,7 @@ public:
     typedef Tensor<Cmpt> type;
 };
 
+
 template<class Cmpt>
 class innerProduct<SphericalTensor<Cmpt>, Tensor<Cmpt> >
 {
@@ -706,6 +776,7 @@ public:
     typedef Tensor<Cmpt> type;
 };
 
+
 template<class Cmpt>
 class innerProduct<Tensor<Cmpt>, SphericalTensor<Cmpt> >
 {
@@ -717,7 +788,7 @@ public:
 
 // * * * * * * * * * * Mixed Tensor SymmTensor Operators * * * * * * * * * * //
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>
 operator+(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 {
@@ -730,7 +801,7 @@ operator+(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>
 operator+(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
 {
@@ -743,7 +814,7 @@ operator+(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>
 operator-(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 {
@@ -756,7 +827,7 @@ operator-(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor<Cmpt>
 operator-(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
 {
@@ -769,8 +840,8 @@ operator-(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
 }
 
 
-//- Inner-product between a spherical tensor and a tensor
-template <class Cmpt>
+//- Inner-product between a symmetric tensor and a tensor
+template<class Cmpt>
 inline Tensor<Cmpt>
 operator&(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 {
@@ -791,8 +862,8 @@ operator&(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 }
 
 
-//- Inner-product between a tensor and a spherical tensor
-template <class Cmpt>
+//- Inner-product between a tensor and a symmetric tensor
+template<class Cmpt>
 inline Tensor<Cmpt>
 operator&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
 {
@@ -813,8 +884,8 @@ operator&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
 }
 
 
-//- Double-dot-product between a spherical tensor and a tensor
-template <class Cmpt>
+//- Double-dot-product between a symmetric tensor and a tensor
+template<class Cmpt>
 inline Cmpt
 operator&&(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 {
@@ -827,8 +898,8 @@ operator&&(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 }
 
 
-//- Double-dot-product between a tensor and a spherical tensor
-template <class Cmpt>
+//- Double-dot-product between a tensor and a symmetric tensor
+template<class Cmpt>
 inline Cmpt
 operator&&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
 {
@@ -840,6 +911,7 @@ operator&&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
     );
 }
 
+
 template<class Cmpt>
 class typeOfSum<SymmTensor<Cmpt>, Tensor<Cmpt> >
 {
@@ -848,6 +920,7 @@ public:
     typedef Tensor<Cmpt> type;
 };
 
+
 template<class Cmpt>
 class typeOfSum<Tensor<Cmpt>, SymmTensor<Cmpt> >
 {
@@ -865,6 +938,7 @@ public:
     typedef Tensor<Cmpt> type;
 };
 
+
 template<class Cmpt>
 class innerProduct<Tensor<Cmpt>, SymmTensor<Cmpt> >
 {
diff --git a/src/foam/primitives/Tensor/tensor/tensor.C b/src/foam/primitives/Tensor/tensor/tensor.C
index 57906b56a..256b97147 100644
--- a/src/foam/primitives/Tensor/tensor/tensor.C
+++ b/src/foam/primitives/Tensor/tensor/tensor.C
@@ -76,6 +76,14 @@ const tensor tensor::min
     -VGREAT, -VGREAT, -VGREAT
 );
 
+template<>
+const tensor tensor::I
+(
+    1, 0, 0,
+    0, 1, 0,
+    0, 0, 1
+);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -221,9 +229,8 @@ vector eigenVector(const tensor& t, const scalar lambda)
             (A.yz()*A.zx() - A.zz()*A.yx())/sd0,
             (A.zy()*A.yx() - A.yy()*A.zx())/sd0
         );
-        ev /= mag(ev);
 
-        return ev;
+        return ev/mag(ev);
     }
     else if (magSd1 > magSd2 && magSd1 > SMALL)
     {
@@ -233,9 +240,8 @@ vector eigenVector(const tensor& t, const scalar lambda)
             1,
             (A.zx()*A.xy() - A.xx()*A.zy())/sd1
         );
-        ev /= mag(ev);
 
-        return ev;
+        return ev/mag(ev);
     }
     else if (magSd2 > SMALL)
     {
@@ -245,9 +251,8 @@ vector eigenVector(const tensor& t, const scalar lambda)
             (A.yx()*A.xz() - A.xx()*A.yz())/sd2,
             1
         );
-        ev /= mag(ev);
 
-        return ev;
+        return ev/mag(ev);
     }
     else
     {
diff --git a/src/foam/primitives/Tensor2D/Tensor2DTemplate.H b/src/foam/primitives/Tensor2D/Tensor2DTemplate.H
index e028d4de1..b4f5abd51 100644
--- a/src/foam/primitives/Tensor2D/Tensor2DTemplate.H
+++ b/src/foam/primitives/Tensor2D/Tensor2DTemplate.H
@@ -46,11 +46,14 @@ SourceFiles
 namespace Foam
 {
 
+template<class Cmpt>
+class SymmTensor2D;
+
 /*---------------------------------------------------------------------------*\
                            Class Tensor2D Declaration
 \*---------------------------------------------------------------------------*/
 
-template <class Cmpt>
+template<class Cmpt>
 class Tensor2D
 :
     public VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>
@@ -75,6 +78,7 @@ public:
         static const Tensor2D one;
         static const Tensor2D max;
         static const Tensor2D min;
+        static const Tensor2D I;
 
 
     //- Component labeling enumeration
@@ -89,6 +93,9 @@ public:
         //- Construct given VectorSpace
         inline Tensor2D(const VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>&);
 
+        //- Construct given SymmTensor2D
+        inline Tensor2D(const SymmTensor2D<Cmpt>&);
+
         //- Construct given SphericalTensor2D
         inline Tensor2D(const SphericalTensor2D<Cmpt>&);
 
@@ -150,6 +157,9 @@ public:
 
     // Member Operators
 
+        //- Copy SymmTensor2D
+        inline void operator=(const SymmTensor2D<Cmpt>&);
+
         //- Copy SphericalTensor2D
         inline void operator=(const SphericalTensor2D<Cmpt>&);
 };
diff --git a/src/foam/primitives/Tensor2D/Tensor2DTemplateI.H b/src/foam/primitives/Tensor2D/Tensor2DTemplateI.H
index a90fd359c..379dcc879 100644
--- a/src/foam/primitives/Tensor2D/Tensor2DTemplateI.H
+++ b/src/foam/primitives/Tensor2D/Tensor2DTemplateI.H
@@ -30,19 +30,27 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt>::Tensor2D()
 {}
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt>::Tensor2D(const VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>& vs)
 :
     VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>(vs)
 {}
 
 
-template <class Cmpt>
+template<class Cmpt>
+inline Tensor2D<Cmpt>::Tensor2D(const SymmTensor2D<Cmpt>& st)
+{
+    this->v_[XX] = st.xx(); this->v_[XY] = st.xy();
+    this->v_[YX] = st.xy(); this->v_[YY] = st.yy();
+}
+
+
+template<class Cmpt>
 inline Tensor2D<Cmpt>::Tensor2D(const SphericalTensor2D<Cmpt>& st)
 {
     this->v_[XX] = st.ii(); this->v_[XY] = 0;
@@ -50,7 +58,7 @@ inline Tensor2D<Cmpt>::Tensor2D(const SphericalTensor2D<Cmpt>& st)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt>::Tensor2D
 (
     const Vector2D<Cmpt>& x,
@@ -62,7 +70,7 @@ inline Tensor2D<Cmpt>::Tensor2D
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt>::Tensor2D
 (
     const Cmpt txx, const Cmpt txy,
@@ -74,7 +82,7 @@ inline Tensor2D<Cmpt>::Tensor2D
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt>::Tensor2D(Istream& is)
 :
     VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>(is)
@@ -83,76 +91,76 @@ inline Tensor2D<Cmpt>::Tensor2D(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template <class Cmpt>
+template<class Cmpt>
 inline Vector2D<Cmpt> Tensor2D<Cmpt>::x() const
 {
     return Vector2D<Cmpt>(this->v_[XX], this->v_[XY]);
 }
 
-template <class Cmpt>
+template<class Cmpt>
 inline Vector2D<Cmpt> Tensor2D<Cmpt>::y() const
 {
     return Vector2D<Cmpt>(this->v_[YX], this->v_[YY]);
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt& Tensor2D<Cmpt>::xx() const
 {
     return this->v_[XX];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt& Tensor2D<Cmpt>::xy() const
 {
     return this->v_[XY];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt& Tensor2D<Cmpt>::yx() const
 {
     return this->v_[YX];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt& Tensor2D<Cmpt>::yy() const
 {
     return this->v_[YY];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& Tensor2D<Cmpt>::xx()
 {
     return this->v_[XX];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& Tensor2D<Cmpt>::xy()
 {
     return this->v_[XY];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& Tensor2D<Cmpt>::yx()
 {
     return this->v_[YX];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& Tensor2D<Cmpt>::yy()
 {
     return this->v_[YY];
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline const Cmpt& Tensor2D<Cmpt>::operator()
 (
     const direction i,
@@ -163,7 +171,7 @@ inline const Cmpt& Tensor2D<Cmpt>::operator()
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt& Tensor2D<Cmpt>::operator()
 (
     const direction i,
@@ -174,7 +182,7 @@ inline Cmpt& Tensor2D<Cmpt>::operator()
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt> Tensor2D<Cmpt>::T() const
 {
     return Tensor2D<Cmpt>
@@ -187,7 +195,15 @@ inline Tensor2D<Cmpt> Tensor2D<Cmpt>::T() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template <class Cmpt>
+template<class Cmpt>
+inline void Tensor2D<Cmpt>::operator=(const SymmTensor2D<Cmpt>& st)
+{
+    this->v_[XX] = st.xx(); this->v_[XY] = st.xy();
+    this->v_[YX] = st.xy(); this->v_[YY] = st.yy();
+}
+
+
+template<class Cmpt>
 inline void Tensor2D<Cmpt>::operator=(const SphericalTensor2D<Cmpt>& st)
 {
     this->v_[XX] = st.ii(); this->v_[XY] = 0;
@@ -199,7 +215,7 @@ inline void Tensor2D<Cmpt>::operator=(const SphericalTensor2D<Cmpt>& st)
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 //- Inner-product between two tensors
-template <class Cmpt>
+template<class Cmpt>
 inline typename innerProduct<Tensor2D<Cmpt>, Tensor2D<Cmpt> >::type
 operator&(const Tensor2D<Cmpt>& t1, const Tensor2D<Cmpt>& t2)
 {
@@ -214,7 +230,7 @@ operator&(const Tensor2D<Cmpt>& t1, const Tensor2D<Cmpt>& t2)
 }
 
 //- Inner-product between a tensor and a vector
-template <class Cmpt>
+template<class Cmpt>
 inline typename innerProduct<Tensor2D<Cmpt>, Vector2D<Cmpt> >::type
 operator&(const Tensor2D<Cmpt>& t, const Vector2D<Cmpt>& v)
 {
@@ -226,7 +242,7 @@ operator&(const Tensor2D<Cmpt>& t, const Vector2D<Cmpt>& v)
 }
 
 //- Inner-product between a vector and a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline typename innerProduct<Vector2D<Cmpt>, Tensor2D<Cmpt> >::type
 operator&(const Vector2D<Cmpt>& v, const Tensor2D<Cmpt>& t)
 {
@@ -238,7 +254,7 @@ operator&(const Vector2D<Cmpt>& v, const Tensor2D<Cmpt>& t)
 }
 
 //- Outer-product between two vectors
-template <class Cmpt>
+template<class Cmpt>
 inline typename outerProduct<Vector2D<Cmpt>, Vector2D<Cmpt> >::type
 operator*(const Vector2D<Cmpt>& v1, const Vector2D<Cmpt>& v2)
 {
@@ -251,7 +267,7 @@ operator*(const Vector2D<Cmpt>& v1, const Vector2D<Cmpt>& v2)
 
 
 //- Return the trace of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt tr(const Tensor2D<Cmpt>& t)
 {
     return t.xx() + t.yy();
@@ -259,7 +275,7 @@ inline Cmpt tr(const Tensor2D<Cmpt>& t)
 
 
 //- Return the spherical part of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline SphericalTensor2D<Cmpt> sph(const Tensor2D<Cmpt>& t)
 {
     return 0.5*tr(t);
@@ -267,29 +283,29 @@ inline SphericalTensor2D<Cmpt> sph(const Tensor2D<Cmpt>& t)
 
 
 //- Return the symmetric part of a tensor
-template <class Cmpt>
-inline Tensor2D<Cmpt> symm(const Tensor2D<Cmpt>& t)
+template<class Cmpt>
+inline SymmTensor2D<Cmpt> symm(const Tensor2D<Cmpt>& t)
 {
-    return Tensor2D<Cmpt>
+    return SymmTensor2D<Cmpt>
     (
         t.xx(), 0.5*(t.xy() + t.yx()),
-        0.5*(t.yx() + t.xy()), t.yy()
+                t.yy()
     );
 }
 
 //- Return the twice the symmetric part of a tensor
-template <class Cmpt>
-inline Tensor2D<Cmpt> twoSymm(const Tensor2D<Cmpt>& t)
+template<class Cmpt>
+inline SymmTensor2D<Cmpt> twoSymm(const Tensor2D<Cmpt>& t)
 {
-    return Tensor2D<Cmpt>
+    return SymmTensor2D<Cmpt>
     (
         t.xx() + t.xx(), t.xy() + t.yx(),
-        t.yx() + t.xy(), t.yy() + t.yy()
+                         t.yy() + t.yy()
     );
 }
 
 //- Return the skew-symmetric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt> skew(const Tensor2D<Cmpt>& t)
 {
     return Tensor2D<Cmpt>
@@ -301,7 +317,7 @@ inline Tensor2D<Cmpt> skew(const Tensor2D<Cmpt>& t)
 
 
 //- Return the deviatoric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt> dev(const Tensor2D<Cmpt>& t)
 {
     return t - SphericalTensor2D<Cmpt>::oneThirdI*tr(t);
@@ -309,7 +325,7 @@ inline Tensor2D<Cmpt> dev(const Tensor2D<Cmpt>& t)
 
 
 //- Return the deviatoric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt> dev2(const Tensor2D<Cmpt>& t)
 {
     return t - SphericalTensor2D<Cmpt>::twoThirdsI*tr(t);
@@ -317,7 +333,7 @@ inline Tensor2D<Cmpt> dev2(const Tensor2D<Cmpt>& t)
 
 
 //- Return the determinant of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt det(const Tensor2D<Cmpt>& t)
 {
     return(t.xx()*t.yy() - t.xy()*t.yx());
@@ -325,7 +341,7 @@ inline Cmpt det(const Tensor2D<Cmpt>& t)
 
 
 //- Return the cofactor tensor of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt> cof(const Tensor2D<Cmpt>& t)
 {
     return Tensor2D<Cmpt>
@@ -337,7 +353,7 @@ inline Tensor2D<Cmpt> cof(const Tensor2D<Cmpt>& t)
 
 
 //- Return the inverse of a tensor given the determinant
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t, const Cmpt dett)
 {
     return cof(t)/dett;
@@ -345,7 +361,7 @@ inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t, const Cmpt dett)
 
 
 //- Return the inverse of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t)
 {
     return inv(t, det(t));
@@ -353,7 +369,7 @@ inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t)
 
 
 //- Return the 1st invariant of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt invariantI(const Tensor2D<Cmpt>& t)
 {
     return tr(t);
@@ -361,7 +377,7 @@ inline Cmpt invariantI(const Tensor2D<Cmpt>& t)
 
 
 //- Return the 2nd invariant of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt invariantII(const Tensor2D<Cmpt>& t)
 {
     return
@@ -377,7 +393,7 @@ inline Cmpt invariantII(const Tensor2D<Cmpt>& t)
 
 
 //- Return the 3rd invariant of a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt invariantIII(const Tensor2D<Cmpt>& t)
 {
     return det(t);
@@ -386,7 +402,7 @@ inline Cmpt invariantIII(const Tensor2D<Cmpt>& t)
 
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt>
 operator+(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
 {
@@ -398,7 +414,7 @@ operator+(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt>
 operator+(const Tensor2D<Cmpt>& t1, const SphericalTensor2D<Cmpt>& st2)
 {
@@ -410,7 +426,7 @@ operator+(const Tensor2D<Cmpt>& t1, const SphericalTensor2D<Cmpt>& st2)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt>
 operator-(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
 {
@@ -422,7 +438,7 @@ operator-(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
 }
 
 
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt>
 operator-(const Tensor2D<Cmpt>& t1, const SphericalTensor2D<Cmpt>& st2)
 {
@@ -435,7 +451,7 @@ operator-(const Tensor2D<Cmpt>& t1, const SphericalTensor2D<Cmpt>& st2)
 
 
 //- Inner-product between a spherical tensor and a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt>
 operator&(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
 {
@@ -450,7 +466,7 @@ operator&(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
 
 
 //- Inner-product between a tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Tensor2D<Cmpt>
 operator&(const Tensor2D<Cmpt>& t1, const SphericalTensor2D<Cmpt>& st2)
 {
@@ -466,7 +482,7 @@ operator&(const Tensor2D<Cmpt>& t1, const SphericalTensor2D<Cmpt>& st2)
 
 
 //- Double-dot-product between a spherical tensor and a tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt
 operator&&(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
 {
@@ -475,7 +491,7 @@ operator&&(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
 
 
 //- Double-dot-product between a tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
 inline Cmpt
 operator&&(const Tensor2D<Cmpt>& t1, const SphericalTensor2D<Cmpt>& st2)
 {
diff --git a/src/foam/primitives/Tensor2D/tensor2D/tensor2D.C b/src/foam/primitives/Tensor2D/tensor2D/tensor2D.C
index bd13f0dbf..a7924b799 100644
--- a/src/foam/primitives/Tensor2D/tensor2D/tensor2D.C
+++ b/src/foam/primitives/Tensor2D/tensor2D/tensor2D.C
@@ -71,6 +71,13 @@ const tensor2D tensor2D::min
     -VGREAT, -VGREAT
 );
 
+template<>
+const tensor2D tensor2D::I
+(
+    1, 0,
+    0, 1
+);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From 0200a880dc1bc131ce26c18830dadffd919a0532 Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Fri, 15 Apr 2016 22:47:50 +0200
Subject: [PATCH 21/55] Backported dev2(T(grad(U)) in turbulence models from
 vanilla 3.0.1

---
 .../compressible/LES/GenEddyVisc/GenEddyVisc.C                | 2 +-
 .../compressible/LES/GenSGSStress/GenSGSStress.C              | 2 +-
 .../compressible/LES/SpalartAllmaras/SpalartAllmaras.C        | 2 +-
 src/turbulenceModels/compressible/RAS/LRR/LRR.C               | 4 ++--
 .../compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C    | 4 ++--
 .../compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C        | 2 +-
 .../compressible/RAS/RNGkEpsilon/RNGkEpsilon.C                | 2 +-
 .../compressible/RAS/SpalartAllmaras/SpalartAllmaras.C        | 2 +-
 src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C     | 2 +-
 src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C   | 2 +-
 src/turbulenceModels/compressible/RAS/laminar/laminar.C       | 2 +-
 .../compressible/RAS/realizableKE/realizableKE.C              | 2 +-
 .../compressible/turbulenceModel/laminar/laminar.C            | 2 +-
 .../incompressible/LES/GenEddyVisc/GenEddyVisc.C              | 2 +-
 .../incompressible/LES/Smagorinsky2/Smagorinsky2.C            | 4 ++--
 .../incompressible/LES/SpalartAllmaras/SpalartAllmaras.C      | 2 +-
 .../incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C            | 4 ++--
 src/turbulenceModels/incompressible/LES/laminar/laminar.C     | 2 +-
 .../incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C        | 2 +-
 .../incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C      | 2 +-
 .../incompressible/RAS/LienCubicKE/LienCubicKE.C              | 2 +-
 .../incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C      | 2 +-
 .../incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C              | 2 +-
 .../incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C      | 2 +-
 .../incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C      | 2 +-
 src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C   | 2 +-
 src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C | 2 +-
 src/turbulenceModels/incompressible/RAS/laminar/laminar.C     | 2 +-
 src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C         | 2 +-
 .../incompressible/RAS/realizableKE/realizableKE.C            | 2 +-
 .../incompressible/turbulenceModel/laminar/laminar.C          | 2 +-
 31 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
index 33442b596..4d754cdfd 100644
--- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -128,7 +128,7 @@ tmp<fvVectorMatrix> GenEddyVisc::divDevRhoBeff(volVectorField& U) const
 {
     return
     (
-      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
+      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
     );
 }
 
diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
index 3287be484..d8c023fa3 100644
--- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
+++ b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
@@ -143,7 +143,7 @@ tmp<fvVectorMatrix> GenSGSStress::divDevRhoBeff(volVectorField& U) const
         fvc::div(rho()*B_ + 0.05*muSgs_*fvc::grad(U))
       + fvc::laplacian(0.95*muSgs_, U, "laplacian(muEff,U)")
       - fvm::laplacian(muEff(), U)
-      - fvc::div(mu()*dev2(fvc::grad(U)().T()))
+      - fvc::div(mu()*dev2(T(fvc::grad(U))))
     );
 }
 
diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
index 2d66f9f26..01b3804de 100644
--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -283,7 +283,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoBeff(volVectorField& U) const
 {
     return
     (
-      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
+      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
     );
 }
 
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
index f5c0e536c..df2ca9e2d 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
@@ -269,7 +269,7 @@ tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
             fvc::div(rho_*R_ + couplingFactor_*mut_*fvc::grad(U))
           + fvc::laplacian((1.0 - couplingFactor_)*mut_, U)
           - fvm::laplacian(muEff(), U)
-          - fvc::div(mu()*dev2(fvc::grad(U)().T()))
+          - fvc::div(mu()*dev2(T(fvc::grad(U)())))
         );
     }
     else
@@ -279,7 +279,7 @@ tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
             fvc::div(rho_*R_)
           + fvc::laplacian(mut_, U)
           - fvm::laplacian(muEff(), U)
-          - fvc::div(mu()*dev2(fvc::grad(U)().T()))
+          - fvc::div(mu()*dev2(T(fvc::grad(U))))
         );
     }
 }
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 10926e1db..2dcf08edb 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -298,7 +298,7 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
             fvc::div(rho_*R_ + couplingFactor_*mut_*fvc::grad(U))
           + fvc::laplacian((1.0 - couplingFactor_)*mut_, U)
           - fvm::laplacian(muEff(), U)
-          - fvc::div(mu()*dev2(fvc::grad(U)().T()))
+          - fvc::div(mu()*dev2(T(fvc::grad(U))))
         );
     }
     else
@@ -308,7 +308,7 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
             fvc::div(rho_*R_)
           + fvc::laplacian(mut_, U)
           - fvm::laplacian(muEff(), U)
-          - fvc::div(mu()*dev2(fvc::grad(U)().T()))
+          - fvc::div(mu()*dev2(T(fvc::grad(U))))
         );
     }
 }
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index 8a0981df6..114670f33 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -244,7 +244,7 @@ tmp<fvVectorMatrix> LaunderSharmaKE::divDevRhoReff(volVectorField& U) const
 {
     return
     (
-      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
+      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U)())))
     );
 }
 
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 85f3d596c..84d2782a5 100644
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -243,7 +243,7 @@ tmp<fvVectorMatrix> RNGkEpsilon::divDevRhoReff(volVectorField& U) const
 {
     return
     (
-      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
+      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
     );
 }
 
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 080c576de..98f37cc92 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -295,7 +295,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(muEff_, U)
-      - fvc::div(muEff_*dev2(fvc::grad(U)().T()))
+      - fvc::div(muEff_*dev2(T(fvc::grad(U))))
     );
 }
 
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
index da139afae..d5bb00b95 100644
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
@@ -226,7 +226,7 @@ tmp<fvVectorMatrix> kEpsilon::divDevRhoReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(muEff(), U)
-      - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
+      - fvc::div(muEff()*dev2(T(fvc::grad(U))))
     );
 }
 
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
index 9ebabc7fd..90fe77060 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -369,7 +369,7 @@ tmp<fvVectorMatrix> kOmegaSST::divDevRhoReff(volVectorField& U) const
 {
     return
     (
-      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
+      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
     );
 }
 
diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.C b/src/turbulenceModels/compressible/RAS/laminar/laminar.C
index 596d3f964..7a43f3fa8 100644
--- a/src/turbulenceModels/compressible/RAS/laminar/laminar.C
+++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.C
@@ -171,7 +171,7 @@ tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(muEff(), U)
-      - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
+      - fvc::div(muEff()*dev2(T(fvc::grad(U))))
     );
 }
 
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
index 105d30085..4be61e2ae 100644
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
@@ -260,7 +260,7 @@ tmp<fvVectorMatrix> realizableKE::divDevRhoReff(volVectorField& U) const
 {
     return
     (
-      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
+      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
     );
 }
 
diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
index 8fd0d8ff3..c677d5998 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
@@ -189,7 +189,7 @@ tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(muEff(), U)
-      - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
+      - fvc::div(muEff()*dev2(T(fvc::grad(U)())))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
index be9eb9b22..b5055e46c 100644
--- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -90,7 +90,7 @@ tmp<fvVectorMatrix> GenEddyVisc::divDevBeff(volVectorField& U) const
 {
     return
     (
-      - fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
index 66c890e89..f98fadf47 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
@@ -73,7 +73,7 @@ Smagorinsky2::Smagorinsky2
 
 tmp<volSymmTensorField> Smagorinsky2::B() const
 {
-    volSymmTensorField D = dev(symm(fvc::grad(U())));
+    volSymmTensorField D = dev2(T(fvc::grad(U())));
 
     return (((2.0/3.0)*I)*k() - 2.0*nuSgs_*D - (2.0*cD2_)*delta()*(D&D));
 }
@@ -94,7 +94,7 @@ tmp<fvVectorMatrix> Smagorinsky2::divDevBeff
 
     return
     (
-      - fvm::laplacian(aniNuEff, U) - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvm::laplacian(aniNuEff, U) - fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
index 8338db89a..0cb487834 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -348,7 +348,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevBeff(volVectorField& U) const
 {
     return
     (
-      - fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
index ae6b45b87..5128ef5ca 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
@@ -425,7 +425,7 @@ tmp<volSymmTensorField> kOmegaSSTSAS::B() const
 
 tmp<volSymmTensorField> kOmegaSSTSAS::devBeff() const
 {
-    return -nuEff()*dev(twoSymm(fvc::grad(U())));
+    return -nuEff()*dev(symm(fvc::grad(U())));
 }
 
 
@@ -433,7 +433,7 @@ tmp<fvVectorMatrix> kOmegaSSTSAS::divDevBeff(volVectorField& U) const
 {
     return
     (
-      - fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/LES/laminar/laminar.C b/src/turbulenceModels/incompressible/LES/laminar/laminar.C
index 9c50dbce7..e8399469b 100644
--- a/src/turbulenceModels/incompressible/LES/laminar/laminar.C
+++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.C
@@ -144,7 +144,7 @@ tmp<fvVectorMatrix> laminar::divDevBeff(volVectorField& U) const
 {
     return
     (
-      - fvm::laplacian(nu(), U) - fvc::div(nu()*dev(fvc::grad(U)().T()))
+      - fvm::laplacian(nu(), U) - fvc::div(nu()*dev2(T(fvc::grad(U)())))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
index 97363cc3d..8ff518e5f 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -195,7 +195,7 @@ tmp<fvVectorMatrix> LamBremhorstKE::divDevReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index ea76a7a19..4ad3a712b 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -201,7 +201,7 @@ tmp<fvVectorMatrix> LaunderSharmaKE::divDevReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
index 4466fd562..a1dc4f040 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
@@ -281,7 +281,7 @@ tmp<fvVectorMatrix> LienCubicKE::divDevReff(volVectorField& U) const
     (
         fvc::div(nonlinearStress_)
       - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvc::div(nuEff()*dev2(T(fvc::grad(U_))))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
index b73419025..c8f7ce0a1 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
@@ -271,7 +271,7 @@ tmp<fvVectorMatrix> NonlinearKEShih::divDevReff(volVectorField& U) const
     (
         fvc::div(nonlinearStress_)
       - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvc::div(nuEff()*dev2(T(fvc::grad(U_))))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 72d7b593b..5a63a1908 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -211,7 +211,7 @@ tmp<fvVectorMatrix> RNGkEpsilon::divDevReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvc::div(nuEff()*dev(T(fvc::grad(U)())))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index a144f177e..6daabfa0c 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -317,7 +317,7 @@ tmp<fvVectorMatrix> SpalartAllmaras::divDevReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(nuEff_, U)
-      - fvc::div(nuEff_*dev(fvc::grad(U)().T()))
+      - fvc::div(nuEff_*dev2(T(fvc::grad(U)())))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C b/src/turbulenceModels/incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C
index a90c9a1c1..1c830f324 100644
--- a/src/turbulenceModels/incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C
@@ -197,7 +197,7 @@ tmp<fvVectorMatrix> coupledKEpsilon::divDevReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvc::div(nuEff()*dev2(T(fvc::grad(U_))))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
index 630a7f458..247ec7ec5 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
@@ -183,7 +183,7 @@ tmp<fvVectorMatrix> kEpsilon::divDevReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvc::div(nuEff()*dev2(T(fvc::grad(U_))))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
index 53f8bd1e6..4de471f1c 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
@@ -345,7 +345,7 @@ tmp<fvVectorMatrix> kOmegaSST::divDevReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvc::div(nuEff()*dev2(T(fvc::grad(U_))))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
index a8c4ec789..2c1c95958 100644
--- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
+++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
@@ -170,7 +170,7 @@ tmp<fvVectorMatrix> laminar::divDevReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
index c0b5d30a4..f7c722ec4 100644
--- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
+++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
@@ -248,7 +248,7 @@ tmp<fvVectorMatrix> qZeta::divDevReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
index e665c7594..7dfc1a449 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
@@ -236,7 +236,7 @@ tmp<fvVectorMatrix> realizableKE::divDevReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
     );
 }
 
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
index c8159e54a..367d1b8df 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
+++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
@@ -193,7 +193,7 @@ tmp<fvVectorMatrix> laminar::divDevReff(volVectorField& U) const
     return
     (
       - fvm::laplacian(nuEff(), U)
-      - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+      - fvc::div(nuEff()*dev2(T(fvc::grad(U)())))
     );
 }
 

From 3578d2650a40ed56b40b78ac492c6c8a06ebe3ba Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Fri, 15 Apr 2016 22:48:26 +0200
Subject: [PATCH 22/55] Add setFluxRequired to simpleFoam

---
 applications/solvers/incompressible/simpleFoam/createFields.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/solvers/incompressible/simpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/createFields.H
index ab4249625..c55d47984 100644
--- a/applications/solvers/incompressible/simpleFoam/createFields.H
+++ b/applications/solvers/incompressible/simpleFoam/createFields.H
@@ -32,7 +32,7 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
-
+    mesh.schemesDict().setFluxRequired(p.name());
 
     singlePhaseTransportModel laminarTransport(U, phi);
 

From ca7d381e05ee8f1d395ad5c3fa6540a68a7fcd5c Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Mon, 18 Apr 2016 15:24:07 +0200
Subject: [PATCH 23/55] BUGFIX: Missing brackets

---
 .../limitedSchemes/linearUpwind/linearUpwind.H                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H
index 12a12b2da..b3d6e16a7 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H
@@ -130,7 +130,7 @@ public:
                 fv::gradScheme<Type>::New
                 (
                     mesh,
-                    mesh.schemesDict.gradScheme(gradSchemeName_)
+                    mesh.schemesDict().gradScheme(gradSchemeName_)
                 )
             )
         {}

From 5d6e83b8343145f5cc6a9cc0f5b2b8f85fb8b561 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Thu, 5 May 2016 14:50:06 +0200
Subject: [PATCH 24/55] Fixed icoFoam tutorials

---
 .../twoBlocksMixingPlaneMismatch_dirY_spanZ/0_orig/U        | 6 ------
 .../system/controlDict                                      | 2 +-
 .../mixingPlane/twoBlocksMixingPlane_dirY_spanZ/0_orig/U    | 6 ------
 .../mixingPlane/twoBlocksMixingPlane_dirZ_spanY/0_orig/U    | 6 ------
 4 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/0_orig/U b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/0_orig/U
index c9b0cd956..e5afe4b5d 100644
--- a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/0_orig/U
+++ b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/0_orig/U
@@ -54,12 +54,6 @@ boundaryField
         type            mixingPlane;
     }
 
-    top
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/system/controlDict b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/system/controlDict
index 44f894261..ddd443c2f 100644
--- a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/system/controlDict
+++ b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/system/controlDict
@@ -24,7 +24,7 @@ stopAt          endTime;
 
 endTime         5.5;
 
-deltaT          0.005;
+deltaT          0.001;
 
 writeControl    timeStep;
 
diff --git a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/0_orig/U b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/0_orig/U
index c9b0cd956..e5afe4b5d 100644
--- a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/0_orig/U
+++ b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/0_orig/U
@@ -54,12 +54,6 @@ boundaryField
         type            mixingPlane;
     }
 
-    top
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/0_orig/U b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/0_orig/U
index c9b0cd956..e5afe4b5d 100644
--- a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/0_orig/U
+++ b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/0_orig/U
@@ -54,12 +54,6 @@ boundaryField
         type            mixingPlane;
     }
 
-    top
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
     frontAndBack
     {
         type            empty;

From 69e2914b9863cdcd3da55052a72f36fcc258fdb5 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Thu, 5 May 2016 16:18:43 +0200
Subject: [PATCH 25/55] Fixed icoDyMFoam tutorials

---
 .../icoDyMFoam/movingBlockRBF/0/U             |  2 +-
 .../icoDyMFoam/movingBlockRBF/0/p             |  2 +-
 .../icoDyMFoam/movingBlockRBF/Allclean        |  3 +-
 .../RBFMotionFunction/Make/options            |  4 +-
 .../movingBlockRBF/constant/polyMesh/boundary | 58 ---------------
 .../icoDyMFoam/movingConeMotion/Allclean      |  5 +-
 .../constant/polyMesh/boundary                | 70 -------------------
 7 files changed, 9 insertions(+), 135 deletions(-)
 delete mode 100644 tutorials/incompressible/icoDyMFoam/movingBlockRBF/constant/polyMesh/boundary
 delete mode 100644 tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/polyMesh/boundary

diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/0/U b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/0/U
index ff7f9cd80..cb18ca53c 100644
--- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/0/U
+++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/0/U
@@ -51,7 +51,7 @@ boundaryField
         value           uniform (1 0 0);
     }
 
-    defaultFaces
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/0/p b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/0/p
index f342b6504..b45151013 100644
--- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/0/p
+++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/0/p
@@ -46,7 +46,7 @@ boundaryField
         value           uniform 0;
     }
 
-    defaultFaces
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/Allclean b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/Allclean
index 9fc8b41e5..915d33114 100755
--- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/Allclean
+++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/Allclean
@@ -4,4 +4,5 @@
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-( cd RBFMotionFunction ; wclean )
\ No newline at end of file
+rm -f constant/polyMesh/boundary
+( cd RBFMotionFunction ; wclean )
diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/Make/options b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/Make/options
index 888aa6373..075878464 100644
--- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/Make/options
+++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/Make/options
@@ -2,9 +2,9 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/meshMotion/RBFMotionSolver/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
     -ldynamicMesh \
     -lfiniteVolume \
-    -lmeshTools \
+    -lmeshTools
diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/constant/polyMesh/boundary b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/constant/polyMesh/boundary
deleted file mode 100644
index ec2cc7ac7..000000000
--- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/constant/polyMesh/boundary
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- 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       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    block
-    {
-        type            wall;
-        nFaces          12;
-        startFace       1184;
-    }
-    top
-    {
-        type            wall;
-        nFaces          25;
-        startFace       1196;
-    }
-    bottom
-    {
-        type            wall;
-        nFaces          25;
-        startFace       1221;
-    }
-    left
-    {
-        type            wall;
-        nFaces          25;
-        startFace       1246;
-    }
-    right
-    {
-        type            wall;
-        nFaces          25;
-        startFace       1271;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          1240;
-        startFace       1296;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/icoDyMFoam/movingConeMotion/Allclean b/tutorials/incompressible/icoDyMFoam/movingConeMotion/Allclean
index e81dc6208..2f69ca107 100755
--- a/tutorials/incompressible/icoDyMFoam/movingConeMotion/Allclean
+++ b/tutorials/incompressible/icoDyMFoam/movingConeMotion/Allclean
@@ -4,5 +4,6 @@
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -f 0/motionGamma
-( cd setMotionMovingCone ; wclean )
\ No newline at end of file
+rm -f 0/motionGamma*
+rm -f constant/polyMesh/boundary
+( cd setMotionMovingCone ; wclean )
diff --git a/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/polyMesh/boundary b/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/polyMesh/boundary
deleted file mode 100644
index e1a441cf7..000000000
--- a/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/polyMesh/boundary
+++ /dev/null
@@ -1,70 +0,0 @@
-/*--------------------------------*- 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       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-8
-(
-    movingWall
-    {
-        type            wall;
-        nFaces          27;
-        startFace       374;
-    }
-    farFieldMoving
-    {
-        type            patch;
-        nFaces          15;
-        startFace       401;
-    }
-    fixedWall
-    {
-        type            wall;
-        nFaces          12;
-        startFace       416;
-    }
-    axis
-    {
-        type            empty;
-        nFaces          0;
-        startFace       428;
-    }
-    left
-    {
-        type            patch;
-        nFaces          10;
-        startFace       428;
-    }
-    farField
-    {
-        type            patch;
-        nFaces          12;
-        startFace       438;
-    }
-    back
-    {
-        type            wedge;
-        nFaces          209;
-        startFace       450;
-    }
-    front
-    {
-        type            wedge;
-        nFaces          209;
-        startFace       659;
-    }
-)
-
-// ************************************************************************* //

From 4ae909ab2b10deead130aca4b92c7a28c2815740 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Fri, 6 May 2016 07:26:55 +0200
Subject: [PATCH 26/55] Small fixes to icoFoam tutorials

---
 tutorials/incompressible/icoFoam/Allclean     |  2 +-
 .../icoFoam/cavity/constant/polyMesh/boundary | 40 -------------
 .../cavityClipped/constant/polyMesh/boundary  | 40 -------------
 .../cavityGrade/constant/polyMesh/boundary    | 40 -------------
 .../icoFoam/elbow/constant/polyMesh/boundary  | 58 -------------------
 5 files changed, 1 insertion(+), 179 deletions(-)
 delete mode 100644 tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary
 delete mode 100644 tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary
 delete mode 100644 tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary
 delete mode 100644 tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary

diff --git a/tutorials/incompressible/icoFoam/Allclean b/tutorials/incompressible/icoFoam/Allclean
index 4ead7ee3e..5dbf32859 100755
--- a/tutorials/incompressible/icoFoam/Allclean
+++ b/tutorials/incompressible/icoFoam/Allclean
@@ -8,7 +8,7 @@ loseCases="cavityFine cavityHighRe"
 
 for case in $keepCases
 do
-    (cd $case && foamCleanTutorials)
+    (cd $case && foamCleanTutorials && rm -f constant/polyMesh/boundary)
 
     if [ "$case" = "elbow" ]
     then
diff --git a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary
deleted file mode 100644
index 9dff5fa4f..000000000
--- a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  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         |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    movingWall
-    {
-        type            wall;
-        nFaces          20;
-        startFace       760;
-    }
-    fixedWalls
-    {
-        type            wall;
-        nFaces          60;
-        startFace       780;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          800;
-        startFace       840;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary
deleted file mode 100644
index dae219c28..000000000
--- a/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- 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       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    lid
-    {
-        type            wall;
-        nFaces          20;
-        startFace       632;
-    }
-    fixedWalls
-    {
-        type            wall;
-        nFaces          60;
-        startFace       652;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          672;
-        startFace       712;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary
deleted file mode 100644
index d290d2f9f..000000000
--- a/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- 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       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-3
-(
-    movingWall
-    {
-        type            wall;
-        nFaces          20;
-        startFace       760;
-    }
-    fixedWalls
-    {
-        type            wall;
-        nFaces          60;
-        startFace       780;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          800;
-        startFace       840;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary
deleted file mode 100644
index aaa70ffd7..000000000
--- a/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- 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       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    wall-4
-    {
-        type            wall;
-        nFaces          100;
-        startFace       1300;
-    }
-    velocity-inlet-5
-    {
-        type            patch;
-        nFaces          8;
-        startFace       1400;
-    }
-    velocity-inlet-6
-    {
-        type            patch;
-        nFaces          4;
-        startFace       1408;
-    }
-    pressure-outlet-7
-    {
-        type            patch;
-        nFaces          8;
-        startFace       1412;
-    }
-    wall-8
-    {
-        type            wall;
-        nFaces          34;
-        startFace       1420;
-    }
-    frontAndBackPlanes
-    {
-        type            empty;
-        nFaces          1836;
-        startFace       1454;
-    }
-)
-
-// ************************************************************************* //

From cd7a8eb4ae6071016aefc65d55c721cd102d73ab Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Fri, 6 May 2016 09:15:00 +0200
Subject: [PATCH 27/55] Backported potentialIbFoam to OF 3.0.1 format

---
 .../immersedBoundary/potentialIbFoam/Make/options        | 3 +++
 .../immersedBoundary/potentialIbFoam/potentialIbFoam.C   | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/applications/solvers/immersedBoundary/potentialIbFoam/Make/options b/applications/solvers/immersedBoundary/potentialIbFoam/Make/options
index b2ecef30a..448c4b608 100644
--- a/applications/solvers/immersedBoundary/potentialIbFoam/Make/options
+++ b/applications/solvers/immersedBoundary/potentialIbFoam/Make/options
@@ -1,6 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/immersedBoundary/immersedBoundary/lnInclude
 
 EXE_LIBS = \
@@ -9,5 +11,6 @@ EXE_LIBS = \
     -lsurfMesh \
     -lsampling \
     -ldynamicMesh \
+    -ldynamicFvMesh \
     -limmersedBoundary \
     -llduSolvers
diff --git a/applications/solvers/immersedBoundary/potentialIbFoam/potentialIbFoam.C b/applications/solvers/immersedBoundary/potentialIbFoam/potentialIbFoam.C
index fcbf81aa0..8fd0773c4 100644
--- a/applications/solvers/immersedBoundary/potentialIbFoam/potentialIbFoam.C
+++ b/applications/solvers/immersedBoundary/potentialIbFoam/potentialIbFoam.C
@@ -32,6 +32,7 @@ Description
 #include "fvCFD.H"
 #include "immersedBoundaryFvPatch.H"
 #include "immersedBoundaryAdjustPhi.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,16 +44,18 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    simpleControl simple(mesh);
+
 #   include "createIbMasks.H"
 #   include "createFields.H"
-#   include "readSIMPLEControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< nl << "Calculating potential flow" << endl;
 
     // Do correctors over the complete set
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (simple.correctNonOrthogonal())
     {
         phi = faceIbMask*(linearInterpolate(U) & mesh.Sf());
 
@@ -86,7 +89,7 @@ int main(int argc, char *argv[])
         // Correct the flux
         phi -= pEqn.flux();
 
-        if (nonOrth != nNonOrthCorr)
+        if (!simple.finalNonOrthogonalIter())
         {
             p.relax();
         }

From 8b1a4ee57e3f395194f7e26dd9c9a61d26a42b66 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Fri, 6 May 2016 10:47:31 +0200
Subject: [PATCH 28/55] Fixed tutorials for icoDyMIbFoam and icoDyMIbFoam

---
 .../system/fvSolution                         | 19 +++++++
 .../system/fvSolution                         | 19 +++++++
 .../system/fvSolution                         | 19 +++++++
 .../system/fvSolution                         | 13 +++++
 .../system/fvSolution                         | 11 ++++
 .../simpleSilencerLaminarIcoIbFoam/temp.28755 |  0
 .../sphereInChannel/system/fvSolution         | 11 ++++
 .../thickPlateRefinedMesh/system/fvSolution   | 13 +++++
 .../thickPlateRefinedMesh/temp.11283          | 50 -------------------
 9 files changed, 105 insertions(+), 50 deletions(-)
 delete mode 100644 tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/temp.28755
 delete mode 100644 tutorials/immersedBoundary/thickPlateRefinedMesh/temp.11283

diff --git a/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSolution b/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSolution
index 515d57959..fed7a307c 100644
--- a/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSolution
+++ b/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSolution
@@ -35,6 +35,25 @@ solvers
         relTol          0.01;
     }
 
+    pFinal
+    {
+        solver          amgSolver;
+        cycle           W-cycle;
+        policy          PAMG;
+        nPreSweeps      2;
+        nPostSweeps     2;
+        groupSize       4;
+        minCoarseEqns   4;
+        nMaxLevels      100;
+        scale           on;
+        smoother        symGaussSeidel;
+
+        minIter         1;
+        maxIter         100;
+        tolerance       1e-7;
+        relTol          0.0;
+    }
+
     U
     {
         solver           BiCGStab;
diff --git a/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/fvSolution b/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/fvSolution
index 515d57959..7081e0aad 100644
--- a/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/fvSolution
+++ b/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/fvSolution
@@ -35,6 +35,25 @@ solvers
         relTol          0.01;
     }
 
+    pFinal
+    {
+        solver          amgSolver;
+        cycle           W-cycle;
+        policy          PAMG;
+        nPreSweeps      2;
+        nPostSweeps     2;
+        groupSize       4;
+        minCoarseEqns   4;
+        nMaxLevels      100;
+        scale           on;
+        smoother        symGaussSeidel;
+
+        minIter         1;
+        maxIter         100;
+        tolerance       1e-7;
+        relTol          0;
+    }
+
     U
     {
         solver           BiCGStab;
diff --git a/tutorials/immersedBoundary/movingCylinderInChannelIco/system/fvSolution b/tutorials/immersedBoundary/movingCylinderInChannelIco/system/fvSolution
index 515d57959..fed7a307c 100644
--- a/tutorials/immersedBoundary/movingCylinderInChannelIco/system/fvSolution
+++ b/tutorials/immersedBoundary/movingCylinderInChannelIco/system/fvSolution
@@ -35,6 +35,25 @@ solvers
         relTol          0.01;
     }
 
+    pFinal
+    {
+        solver          amgSolver;
+        cycle           W-cycle;
+        policy          PAMG;
+        nPreSweeps      2;
+        nPostSweeps     2;
+        groupSize       4;
+        minCoarseEqns   4;
+        nMaxLevels      100;
+        scale           on;
+        smoother        symGaussSeidel;
+
+        minIter         1;
+        maxIter         100;
+        tolerance       1e-7;
+        relTol          0.0;
+    }
+
     U
     {
         solver           BiCGStab;
diff --git a/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/fvSolution b/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/fvSolution
index 1cca3d46a..81171bbaa 100644
--- a/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/fvSolution
+++ b/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/fvSolution
@@ -40,6 +40,19 @@ solvers
 //     }
 
     p
+    {
+        solver          GAMG;
+        tolerance       1e-07;
+        relTol          0.01;
+        minIter 1;
+        smoother        GaussSeidel;
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    pFinal
     {
         solver          GAMG;
         tolerance       1e-07;
diff --git a/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/fvSolution b/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/fvSolution
index 1b8355d52..eaa35d2a7 100644
--- a/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/fvSolution
+++ b/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/fvSolution
@@ -21,6 +21,17 @@ solvers
         solver           CG;
         preconditioner   Cholesky;
 
+        minIter          1;
+        maxIter          1000;
+        tolerance        1e-06;
+        relTol           0.01;
+    }
+
+    pFinal
+    {
+        solver           CG;
+        preconditioner   Cholesky;
+
         minIter          1;
         maxIter          1000;
         tolerance        1e-06;
diff --git a/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/temp.28755 b/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/temp.28755
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tutorials/immersedBoundary/sphereInChannel/system/fvSolution b/tutorials/immersedBoundary/sphereInChannel/system/fvSolution
index 94b5a2ca9..2c386d824 100644
--- a/tutorials/immersedBoundary/sphereInChannel/system/fvSolution
+++ b/tutorials/immersedBoundary/sphereInChannel/system/fvSolution
@@ -21,6 +21,17 @@ solvers
         solver           CG;
         preconditioner   Cholesky;
 
+        minIter          1;
+        maxIter          1000;
+        tolerance        1e-06;
+        relTol           0.01;
+    }
+
+    pFinal
+    {
+        solver           CG;
+        preconditioner   Cholesky;
+
         minIter          1;
         maxIter          1000;
         tolerance        1e-06;
diff --git a/tutorials/immersedBoundary/thickPlateRefinedMesh/system/fvSolution b/tutorials/immersedBoundary/thickPlateRefinedMesh/system/fvSolution
index 6a3eb55b6..d0c9e0b93 100644
--- a/tutorials/immersedBoundary/thickPlateRefinedMesh/system/fvSolution
+++ b/tutorials/immersedBoundary/thickPlateRefinedMesh/system/fvSolution
@@ -28,6 +28,19 @@ solvers
 //     }
 
     p
+    {
+        solver          GAMG;
+        tolerance       1e-07;
+        relTol          0.01;
+        minIter 1;
+        smoother        GaussSeidel;
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    pFinal
     {
         solver          GAMG;
         tolerance       1e-07;
diff --git a/tutorials/immersedBoundary/thickPlateRefinedMesh/temp.11283 b/tutorials/immersedBoundary/thickPlateRefinedMesh/temp.11283
deleted file mode 100644
index 097de4ec2..000000000
--- a/tutorials/immersedBoundary/thickPlateRefinedMesh/temp.11283
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- 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;
-    object      decomposeParDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-numberOfSubdomains 4;
-
-method simple;
-
-simpleCoeffs
-{
-    n (2 2 1);
-    delta           0.001;
-}
-
-hierarchicalCoeffs
-{
-    n               (1 1 1);
-    delta           0.001;
-    order           xyz;
-}
-
-metisCoeffs
-{
-    processorWeights 4(1 1 1 1);
-}
-
-manualCoeffs
-{
-    dataFile        "cellDecomposition";
-}
-
-distributed     no;
-
-roots
-(
-);
-
-// ************************************************************************* //

From 651abe67f103169b756a80bbf1d3228aecad8449 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Fri, 6 May 2016 11:11:54 +0200
Subject: [PATCH 29/55] Backported (solutionControl) channelFoam,
 nonNewtonianIcoFoam, pisoFoam, shallowWaterFoam solvers to OF 3.0.1 format

---
 .../incompressible/channelFoam/channelFoam.C  | 30 ++++++++--------
 .../nonNewtonianIcoFoam/nonNewtonianIcoFoam.C | 27 +++++++++++----
 .../incompressible/pisoFoam/pisoFoam.C        | 16 ++++-----
 .../shallowWaterFoam/shallowWaterFoam.C       | 34 +++++++++----------
 4 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/applications/solvers/incompressible/channelFoam/channelFoam.C b/applications/solvers/incompressible/channelFoam/channelFoam.C
index ba2b77038..38f7da754 100644
--- a/applications/solvers/incompressible/channelFoam/channelFoam.C
+++ b/applications/solvers/incompressible/channelFoam/channelFoam.C
@@ -35,6 +35,7 @@ Description
 #include "IFstream.H"
 #include "OFstream.H"
 #include "Random.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,6 +44,9 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
+
+    pisoControl piso(mesh);
+
     #include "readTransportProperties.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
@@ -54,12 +58,12 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        #include "readPISOControls.H"
-
         #include "CourantNo.H"
 
         sgsModel->correct();
 
+        // Momentum predictor
+
         fvVectorMatrix UEqn
         (
             fvm::ddt(U)
@@ -69,7 +73,7 @@ int main(int argc, char *argv[])
             flowDirection*gradP
         );
 
-        if (momentumPredictor)
+        if (piso.momentumPredictor())
         {
             solve(UEqn == -fvc::grad(p));
         }
@@ -79,7 +83,7 @@ int main(int argc, char *argv[])
 
         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())
@@ -87,7 +91,8 @@ int main(int argc, char *argv[])
 
             adjustPhi(phi, U, p);
 
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            // Non-orthogonal pressure corrector loop
+            while (piso.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
@@ -95,17 +100,12 @@ int main(int argc, char *argv[])
                 );
 
                 pEqn.setReference(pRefCell, pRefValue);
+                pEqn.solve
+                (
+                    mesh.solutionDict().solver(p.select(piso.finalInnerIter()))
+                );
 
-                if (corr == nCorr-1 && nonOrth == nNonOrthCorr)
-                {
-                    pEqn.solve(mesh.solutionDict().solver(p.name() + "Final"));
-                }
-                else
-                {
-                    pEqn.solve(mesh.solutionDict().solver(p.name()));
-                }
-
-                if (nonOrth == nNonOrthCorr)
+                if (piso.finalNonOrthogonalIter())
                 {
                     phi -= pEqn.flux();
                 }
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
index 6420661d7..9faf6fbd2 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
@@ -31,6 +31,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -40,6 +41,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMeshNoClear.H"
+
+    pisoControl piso(mesh);
+
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 
@@ -51,11 +55,12 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPISOControls.H"
 #       include "CourantNo.H"
 
         fluid.correct();
 
+        // Momentum predictor
+
         fvVectorMatrix UEqn
         (
             fvm::ddt(U)
@@ -63,11 +68,13 @@ int main(int argc, char *argv[])
           - fvm::laplacian(fluid.nu(), U)
         );
 
-        solve(UEqn == -fvc::grad(p));
+        if (piso.momentumPredictor())
+        {
+            solve(UEqn == -fvc::grad(p));
+        }
 
         // --- PISO loop
-
-        for (int corr = 0; corr < nCorr; corr++)
+        while (piso.correct())
         {
             volScalarField rUA = 1.0/UEqn.A();
 
@@ -77,17 +84,23 @@ int main(int argc, char *argv[])
 
             adjustPhi(phi, U, p);
 
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            // Non-orthogonal pressure corrector loop
+            while (piso.correctNonOrthogonal())
             {
+                // Pressure corrector
+
                 fvScalarMatrix pEqn
                 (
                     fvm::laplacian(rUA, p) == fvc::div(phi)
                 );
 
                 pEqn.setReference(pRefCell, pRefValue);
-                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/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index 502df6b3b..2796ab514 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -100,15 +100,13 @@ int main(int argc, char *argv[])
                     );
 
                     pEqn.setReference(pRefCell, pRefValue);
-
-                    if (piso.finalInnerIter())
-                    {
-                        pEqn.solve(mesh.solutionDict().solver("pFinal"));
-                    }
-                    else
-                    {
-                        pEqn.solve();
-                    }
+                    pEqn.solve
+                    (
+                        mesh.solutionDict().solver
+                        (
+                            p.select(piso.finalInnerIter())
+                        )
+                    );
 
                     if (piso.finalNonOrthogonalIter())
                     {
diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
index 46731582a..92896033b 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
+++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
@@ -33,6 +33,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -41,6 +42,9 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
 
@@ -52,10 +56,10 @@ int main(int argc, char *argv[])
     {
         Info<< "\n Time = " << runTime.timeName() << nl << endl;
 
-        #include "readPISOControls.H"
         #include "CourantNo.H"
 
-        for (int ucorr=0; ucorr<nOuterCorr; ucorr++)
+        // --- Pressure-velocity PIMPLE corrector loop
+        while (pimple.loop())
         {
             surfaceScalarField phiv("phiv", phi/fvc::interpolate(h));
 
@@ -67,7 +71,7 @@ int main(int argc, char *argv[])
 
             hUEqn.relax();
 
-            if (momentumPredictor)
+            if (pimple.momentumPredictor())
             {
                 if (rotating)
                 {
@@ -86,8 +90,8 @@ int main(int argc, char *argv[])
                 }
             }
 
-            // --- PISO loop
-            for (int corr = 0; corr < nCorr; corr++)
+            // --- Pressure corrector loop
+            while (pimple.correct())
             {
                 surfaceScalarField hf = fvc::interpolate(h);
                 volScalarField rUA = 1.0/hUEqn.A();
@@ -108,7 +112,7 @@ int main(int argc, char *argv[])
                     + fvc::ddtPhiCorr(rUA, h, hU, phi)
                     - phih0;
 
-                for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+                while (pimple.correctNonOrthogonal())
                 {
                     fvScalarMatrix hEqn
                     (
@@ -117,19 +121,15 @@ int main(int argc, char *argv[])
                       - fvm::laplacian(ghrUAf, h)
                     );
 
-                    if (ucorr < nOuterCorr - 1 || corr < nCorr - 1)
-                    {
-                        hEqn.solve();
-                    }
-                    else
-                    {
-                        hEqn.solve
+                    hEqn.solve
+                    (
+                        mesh.solutionDict().solver
                         (
-                            mesh.solutionDict().solver(h.name() + "Final")
-                        );
-                    }
+                            h.select(pimple.finalInnerIter())
+                        )
+                    );
 
-                    if (nonOrth == nNonOrthCorr)
+                    if (pimple.finalNonOrthogonalIter())
                     {
                         phi += hEqn.flux();
                     }

From 0593778986eb468122d1cfe6fda9047a51fb17ee Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Fri, 6 May 2016 11:41:26 +0200
Subject: [PATCH 30/55] Added setFluxRequired to channelFoam,
 nonNewtonianIcoFoam, pisoFoam, shallowWaterFoam

---
 applications/solvers/incompressible/channelFoam/createFields.H  | 2 +-
 .../solvers/incompressible/nonNewtonianIcoFoam/createFields.H   | 1 +
 applications/solvers/incompressible/pisoFoam/createFields.H     | 1 +
 .../solvers/incompressible/shallowWaterFoam/createFields.H      | 2 ++
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/applications/solvers/incompressible/channelFoam/createFields.H b/applications/solvers/incompressible/channelFoam/createFields.H
index 7099762cc..20af043b8 100644
--- a/applications/solvers/incompressible/channelFoam/createFields.H
+++ b/applications/solvers/incompressible/channelFoam/createFields.H
@@ -33,7 +33,7 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
-
+    mesh.schemesDict().setFluxRequired(p.name());
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/createFields.H b/applications/solvers/incompressible/nonNewtonianIcoFoam/createFields.H
index ef08e58c7..2eb6e0ed4 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/createFields.H
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/createFields.H
@@ -37,3 +37,4 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/incompressible/pisoFoam/createFields.H b/applications/solvers/incompressible/pisoFoam/createFields.H
index 7cae304f6..4342b3c25 100644
--- a/applications/solvers/incompressible/pisoFoam/createFields.H
+++ b/applications/solvers/incompressible/pisoFoam/createFields.H
@@ -32,6 +32,7 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
 
 
     singlePhaseTransportModel laminarTransport(U, phi);
diff --git a/applications/solvers/incompressible/shallowWaterFoam/createFields.H b/applications/solvers/incompressible/shallowWaterFoam/createFields.H
index cfc14216f..00629bf47 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/createFields.H
+++ b/applications/solvers/incompressible/shallowWaterFoam/createFields.H
@@ -72,3 +72,5 @@ hTotal.write();
 
 Info<< "Creating Coriolis Force" << endl;
 const dimensionedVector F("F", ((2.0*Omega) & gHat)*gHat);
+
+mesh.schemesDict().setFluxRequired(h.name());

From 897213e27e3b067bf97d2668e226d6d86236cf47 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Fri, 6 May 2016 12:26:39 +0200
Subject: [PATCH 31/55] Removed fluxRequired from fvSchemes in icoFoam
 tutorials

---
 .../incompressible/icoFoam/cavityClipped/system/fvSchemes   | 6 ------
 .../incompressible/icoFoam/cavityGrade/system/fvSchemes     | 6 ------
 tutorials/incompressible/icoFoam/elbow/system/fvSchemes     | 6 ------
 .../system/fvSchemes                                        | 6 ------
 .../twoBlocksMixingPlane_dirY_spanZ/system/fvSchemes        | 6 ------
 .../twoBlocksMixingPlane_dirZ_spanY/system/fvSchemes        | 6 ------
 6 files changed, 36 deletions(-)

diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/fvSchemes b/tutorials/incompressible/icoFoam/cavityClipped/system/fvSchemes
index 92003c4fd..87ac27150 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavityClipped/system/fvSchemes
@@ -49,10 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/fvSchemes b/tutorials/incompressible/icoFoam/cavityGrade/system/fvSchemes
index 92003c4fd..87ac27150 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavityGrade/system/fvSchemes
@@ -49,10 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/elbow/system/fvSchemes b/tutorials/incompressible/icoFoam/elbow/system/fvSchemes
index 0cd903c76..43d4f728d 100644
--- a/tutorials/incompressible/icoFoam/elbow/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/elbow/system/fvSchemes
@@ -49,10 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/system/fvSchemes b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/system/fvSchemes
index 5eb08048e..9156b667b 100644
--- a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlaneMismatch_dirY_spanZ/system/fvSchemes
@@ -49,12 +49,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 mixingPlane
 {
     default        areaAveraging;
diff --git a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/system/fvSchemes b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/system/fvSchemes
index 5eb08048e..9156b667b 100644
--- a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirY_spanZ/system/fvSchemes
@@ -49,12 +49,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 mixingPlane
 {
     default        areaAveraging;
diff --git a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/system/fvSchemes b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/system/fvSchemes
index 5eb08048e..9156b667b 100644
--- a/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/mixingPlane/twoBlocksMixingPlane_dirZ_spanY/system/fvSchemes
@@ -49,12 +49,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 mixingPlane
 {
     default        areaAveraging;

From f49f21f6afb97cc7a893e9699e0e687b5be46213 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Fri, 6 May 2016 12:34:13 +0200
Subject: [PATCH 32/55] Changed foam version from 3.2 to 4.0

---
 etc/bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/bashrc b/etc/bashrc
index ba0118b36..aaa41f561 100755
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -34,7 +34,7 @@
 
 export WM_PROJECT=foam
 export WM_FORK=extend
-export WM_PROJECT_VERSION=3.2
+export WM_PROJECT_VERSION=4.0
 
 # helps to easily write #ifdefs to detect a dev-version
 export FOAM_DEV=1

From 3f9d34ff1ae1a7d08acd2607bfb90aabeab292a6 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Fri, 6 May 2016 12:34:43 +0200
Subject: [PATCH 33/55] Removed fluxRequired from fvSchemes in icoDyMFoam
 tutorials

---
 .../incompressible/icoDyMFoam/mixer2D/system/fvSchemes     | 7 -------
 .../incompressible/icoDyMFoam/mixerGgi/system/fvSchemes    | 7 -------
 .../icoDyMFoam/movingBlockRBF/system/fvSchemes             | 7 -------
 .../icoDyMFoam/movingConeMotion/system/fvSchemes           | 6 ------
 .../icoDyMFoam/movingConeTopo/system/fvSchemes             | 7 -------
 .../icoDyMFoam/turboPassageRotating/system/fvSchemes       | 7 -------
 6 files changed, 41 deletions(-)

diff --git a/tutorials/incompressible/icoDyMFoam/mixer2D/system/fvSchemes b/tutorials/incompressible/icoDyMFoam/mixer2D/system/fvSchemes
index c4f18cef8..cbc6a5ccf 100644
--- a/tutorials/incompressible/icoDyMFoam/mixer2D/system/fvSchemes
+++ b/tutorials/incompressible/icoDyMFoam/mixer2D/system/fvSchemes
@@ -51,11 +51,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pcorr;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoDyMFoam/mixerGgi/system/fvSchemes b/tutorials/incompressible/icoDyMFoam/mixerGgi/system/fvSchemes
index 62a4dd90f..d456a7916 100644
--- a/tutorials/incompressible/icoDyMFoam/mixerGgi/system/fvSchemes
+++ b/tutorials/incompressible/icoDyMFoam/mixerGgi/system/fvSchemes
@@ -53,11 +53,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pcorr;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/system/fvSchemes b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/system/fvSchemes
index 7b0fa4260..3d99867fd 100644
--- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/system/fvSchemes
+++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/system/fvSchemes
@@ -50,11 +50,4 @@ snGradSchemes
     default         limited 0.5;
 }
 
-fluxRequired
-{
-    default         no;
-    pcorr;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoDyMFoam/movingConeMotion/system/fvSchemes b/tutorials/incompressible/icoDyMFoam/movingConeMotion/system/fvSchemes
index f4314e3bf..fe5580e4c 100644
--- a/tutorials/incompressible/icoDyMFoam/movingConeMotion/system/fvSchemes
+++ b/tutorials/incompressible/icoDyMFoam/movingConeMotion/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    pcorr;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoDyMFoam/movingConeTopo/system/fvSchemes b/tutorials/incompressible/icoDyMFoam/movingConeTopo/system/fvSchemes
index 5d2534be0..efbcc2cfa 100644
--- a/tutorials/incompressible/icoDyMFoam/movingConeTopo/system/fvSchemes
+++ b/tutorials/incompressible/icoDyMFoam/movingConeTopo/system/fvSchemes
@@ -51,11 +51,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pcorr;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/fvSchemes b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/fvSchemes
index 4c2b28ee8..3fdef5369 100644
--- a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/fvSchemes
+++ b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/fvSchemes
@@ -48,11 +48,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pcorr;
-    p;
-}
-
 // ************************************************************************* //

From c89ee2d0ef114a7960efa1c66ddad8f8df64e70e Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Fri, 6 May 2016 13:02:39 +0200
Subject: [PATCH 34/55] Added setFlux required to potentialIbFoam

---
 .../solvers/immersedBoundary/potentialIbFoam/createFields.H      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/solvers/immersedBoundary/potentialIbFoam/createFields.H b/applications/solvers/immersedBoundary/potentialIbFoam/createFields.H
index a25abd7d9..d45cac025 100644
--- a/applications/solvers/immersedBoundary/potentialIbFoam/createFields.H
+++ b/applications/solvers/immersedBoundary/potentialIbFoam/createFields.H
@@ -47,3 +47,4 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());

From ff283646df4ec1ac7d058cc13411a34d6aca4087 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Fri, 6 May 2016 14:47:43 +0200
Subject: [PATCH 35/55] Removed fluxRequired from fvSchemes in icoIbFoam
 tutorials

---
 .../cylinderInChannelFineIcoIbFoam/system/fvSchemes          | 5 -----
 .../cylinderInChannelIcoIbFoam/system/fvSchemes              | 5 -----
 .../movingCylinderInChannelIco/system/fvSchemes              | 5 -----
 .../pitzDailyLaminarIcoIbFoam/system/fvSchemes               | 5 -----
 .../simpleSilencerLaminarIcoIbFoam/system/fvSchemes          | 5 -----
 tutorials/immersedBoundary/sphereInChannel/system/fvSchemes  | 5 -----
 .../immersedBoundary/thickPlateRefinedMesh/system/fvSchemes  | 5 -----
 7 files changed, 35 deletions(-)

diff --git a/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSchemes b/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSchemes
index 520f08ba8..274ef2b62 100644
--- a/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSchemes
+++ b/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSchemes
@@ -56,9 +56,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/fvSchemes b/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/fvSchemes
index 974b06b9a..0d8f54d38 100644
--- a/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/fvSchemes
+++ b/tutorials/immersedBoundary/cylinderInChannelIcoIbFoam/system/fvSchemes
@@ -51,9 +51,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/movingCylinderInChannelIco/system/fvSchemes b/tutorials/immersedBoundary/movingCylinderInChannelIco/system/fvSchemes
index 974b06b9a..0d8f54d38 100644
--- a/tutorials/immersedBoundary/movingCylinderInChannelIco/system/fvSchemes
+++ b/tutorials/immersedBoundary/movingCylinderInChannelIco/system/fvSchemes
@@ -51,9 +51,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/fvSchemes b/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/fvSchemes
index 8c6988685..05fca3f1f 100644
--- a/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/fvSchemes
+++ b/tutorials/immersedBoundary/pitzDailyLaminarIcoIbFoam/system/fvSchemes
@@ -53,9 +53,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/fvSchemes b/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/fvSchemes
index 41b41e1e2..322a13454 100644
--- a/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/fvSchemes
+++ b/tutorials/immersedBoundary/simpleSilencerLaminarIcoIbFoam/system/fvSchemes
@@ -53,9 +53,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/sphereInChannel/system/fvSchemes b/tutorials/immersedBoundary/sphereInChannel/system/fvSchemes
index 41b41e1e2..322a13454 100644
--- a/tutorials/immersedBoundary/sphereInChannel/system/fvSchemes
+++ b/tutorials/immersedBoundary/sphereInChannel/system/fvSchemes
@@ -53,9 +53,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/thickPlateRefinedMesh/system/fvSchemes b/tutorials/immersedBoundary/thickPlateRefinedMesh/system/fvSchemes
index 41b41e1e2..322a13454 100644
--- a/tutorials/immersedBoundary/thickPlateRefinedMesh/system/fvSchemes
+++ b/tutorials/immersedBoundary/thickPlateRefinedMesh/system/fvSchemes
@@ -53,9 +53,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //

From 99fdf7833b5c82a81227da0386980debb2d3d2db Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Fri, 6 May 2016 15:20:34 +0200
Subject: [PATCH 36/55] Fixed channelFoam, nonNewtonianIcoFoam, pisoFoam and
 shallowWaterFoam tutorials

---
 .../channelFoam/channel395/Allclean           |  2 +-
 .../channel395/constant/polyMesh/boundary     | 62 -------------------
 .../channelFoam/channel395/system/fvSchemes   |  8 +--
 .../offsetCylinder/constant/polyMesh/boundary | 62 -------------------
 .../offsetCylinder/system/fvSchemes           |  6 --
 .../pisoFoam/les/pitzDaily/system/fvSchemes   |  8 +--
 .../pitzDailyDirectMapped/system/fvSchemes    |  8 +--
 .../pisoFoam/ras/cavity/system/fvSchemes      |  8 +--
 .../squareBump/system/fvSchemes               |  5 --
 .../squareBump/system/fvSolution              |  2 +-
 10 files changed, 6 insertions(+), 165 deletions(-)
 delete mode 100644 tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary
 delete mode 100644 tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary

diff --git a/tutorials/incompressible/channelFoam/channel395/Allclean b/tutorials/incompressible/channelFoam/channel395/Allclean
index e80d74cac..57e70ec17 100755
--- a/tutorials/incompressible/channelFoam/channel395/Allclean
+++ b/tutorials/incompressible/channelFoam/channel395/Allclean
@@ -4,4 +4,4 @@
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
+rm -f constant/polyMesh/boundary
diff --git a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary
deleted file mode 100644
index 182f53ca8..000000000
--- a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- 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       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    bottomWall
-    {
-        type            wall;
-        nFaces          1200;
-        startFace       175300;
-    }
-    topWall
-    {
-        type            wall;
-        nFaces          1200;
-        startFace       176500;
-    }
-    sides1
-    {
-        type            cyclic;
-        nFaces          2000;
-        startFace       177700;
-        featureCos      0.9;
-    }
-    sides2
-    {
-        type            cyclic;
-        nFaces          2000;
-        startFace       179700;
-        featureCos      0.9;
-    }
-    inout1
-    {
-        type            cyclic;
-        nFaces          1500;
-        startFace       181700;
-        featureCos      0.9;
-    }
-    inout2
-    {
-        type            cyclic;
-        nFaces          1500;
-        startFace       183200;
-        featureCos      0.9;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/channelFoam/channel395/system/fvSchemes b/tutorials/incompressible/channelFoam/channel395/system/fvSchemes
index b8b2e5c55..34170f234 100644
--- a/tutorials/incompressible/channelFoam/channel395/system/fvSchemes
+++ b/tutorials/incompressible/channelFoam/channel395/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
     div(phi,B)      Gauss limitedLinear 1;
     div(B)          Gauss linear;
     div(phi,nuTilda) Gauss limitedLinear 1;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -58,10 +58,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary
deleted file mode 100644
index d2a30ff4c..000000000
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- 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       polyBoundaryMesh;
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-left
-{
-    type patch;
-    nFaces 35;
-    startFace 3485;
-}
-
-right
-{
-    type patch;
-    nFaces 35;
-    startFace 3520;
-}
-
-down
-{
-    type wall;
-    nFaces 40;
-    startFace 3555;
-}
-
-up
-{
-    type wall;
-    nFaces 40;
-    startFace 3595;
-}
-
-cylinder
-{
-    type wall;
-    nFaces 80;
-    startFace 3635;
-}
-
-defaultFaces
-{
-    type empty;
-    nFaces 3600;
-    startFace 3715;
-}
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
index 1a04dfafd..2ea83c26e 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
@@ -49,10 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
index add096294..eb24e4a27 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,B)      Gauss limitedLinear 1;
     div(phi,nuTilda) Gauss limitedLinear 1;
     div(B)          Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -59,10 +59,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes
index adde3acdc..c3aa8e8d7 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,B)      Gauss limitedLinear 1;
     div(phi,nuTilda) Gauss limitedLinear 1;
     div(B)          Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -59,10 +59,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
index 545f346e8..309088842 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -61,10 +61,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
index 0fb0b8143..209969ee1 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
@@ -45,9 +45,4 @@ snGradSchemes
     default         uncorrected;
 }
 
-fluxRequired
-{
-    h;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
index 7017ebfa0..1c67963f1 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
@@ -41,7 +41,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors 3;
     nCorrectors      1;

From a704cb308e945f04686b88f01aaced4142817455 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Fri, 6 May 2016 15:55:13 +0200
Subject: [PATCH 37/55] Backported pimpleFoam (solutionControl and
 setFluxRequired) from OF 3.0.1

---
 .../solvers/incompressible/pimpleFoam/UEqn.H  | 34 ++++++-------------
 .../incompressible/pimpleFoam/createFields.H  |  2 +-
 .../solvers/incompressible/pimpleFoam/pEqn.H  | 24 ++++---------
 .../incompressible/pimpleFoam/pimpleFoam.C    | 11 +++---
 4 files changed, 25 insertions(+), 46 deletions(-)

diff --git a/applications/solvers/incompressible/pimpleFoam/UEqn.H b/applications/solvers/incompressible/pimpleFoam/UEqn.H
index 64ffbea02..1132b3a17 100644
--- a/applications/solvers/incompressible/pimpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/UEqn.H
@@ -7,34 +7,20 @@ tmp<fvVectorMatrix> UEqn
   + turbulence->divDevReff(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().relaxationFactor(U.select(pimple.finalIter()))
+);
 
 volScalarField rUA = 1.0/UEqn().A();
 
-if (momentumPredictor)
+if (pimple.momentumPredictor())
 {
-    if (oCorr == nOuterCorr-1)
-    {
-        solve(UEqn() == -fvc::grad(p), mesh.solutionDict().solver("UFinal"));
-    }
-    else
-    {
-        solve(UEqn() == -fvc::grad(p));
-    }
+    solve
+    (
+        UEqn() == -fvc::grad(p),
+        mesh.solutionDict().solver((U.select(pimple.finalIter())))
+    );
 }
 else
 {
diff --git a/applications/solvers/incompressible/pimpleFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/createFields.H
index e4127150c..041f8869c 100644
--- a/applications/solvers/incompressible/pimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/pimpleFoam/createFields.H
@@ -32,7 +32,7 @@ volVectorField U
 label pRefCell = 0;
 scalar pRefValue = 0.0;
 setRefCell(p, mesh.solutionDict().subDict("PIMPLE"), pRefCell, pRefValue);
-
+mesh.schemesDict().setFluxRequired(p.name());
 
 singlePhaseTransportModel laminarTransport(U, phi);
 
diff --git a/applications/solvers/incompressible/pimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pEqn.H
index 3a750deb8..a5f1fc026 100644
--- a/applications/solvers/incompressible/pimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/pEqn.H
@@ -1,6 +1,6 @@
 U = rUA*UEqn().H();
 
-if (nCorr <= 1)
+if (pimple.nCorrPISO() <= 1)
 {
     UEqn.clear();
 }
@@ -11,7 +11,7 @@ phi = (fvc::interpolate(U) & mesh.Sf())
 adjustPhi(phi, U, p);
 
 // Non-orthogonal pressure corrector loop
-for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+while (pimple.correctNonOrthogonal())
 {
     // Pressure corrector
     fvScalarMatrix pEqn
@@ -20,22 +20,12 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     );
 
     pEqn.setReference(pRefCell, pRefValue);
-
-    if
+    pEqn.solve
     (
-        oCorr == nOuterCorr - 1
-     && corr == nCorr - 1
-     && nonOrth == nNonOrthCorr
-    )
-    {
-        pEqn.solve(mesh.solutionDict().solver("pFinal"));
-    }
-    else
-    {
-        pEqn.solve();
-    }
+        mesh.solutionDict().solver(p.select(pimple.finalInnerIter()))
+    );
 
-    if (nonOrth == nNonOrthCorr)
+    if (pimple.finalNonOrthogonalIter())
     {
         phi -= pEqn.flux();
     }
@@ -44,7 +34,7 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
 #include "continuityErrs.H"
 
 // Explicitly relax pressure for momentum corrector except for last corrector
-if (oCorr != nOuterCorr-1)
+if (!pimple.finalIter())
 {
     p.relax();
 }
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index 30d03c55d..0cd40d631 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -35,6 +35,7 @@ Description
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulenceModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,6 +44,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"
 
@@ -51,7 +55,6 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
 #       include "readTimeControls.H"
-#       include "readPIMPLEControls.H"
 #       include "CourantNo.H"
 #       include "setDeltaT.H"
 
@@ -60,9 +63,9 @@ 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())
         {
-            if (nOuterCorr != 1)
+            if (!pimple.firstIter())
             {
                 p.storePrevIter();
             }
@@ -70,7 +73,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"
             }

From 36b4fa38115b2abad22082251ede0f3fe79a4e0a Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Fri, 6 May 2016 22:11:03 +0200
Subject: [PATCH 38/55] Backported createTimeControls.H and readTimeControls.H
 from OF 3.0.1, and pimpleDyMFoam

---
 .../incompressible/pimpleDyMFoam/UEqn.H       | 21 +++-------
 .../incompressible/pimpleDyMFoam/correctPhi.H |  4 +-
 .../pimpleDyMFoam/createControls.H            | 11 +++++
 .../pimpleDyMFoam/createFields.H              |  1 +
 .../pimpleDyMFoam/pimpleDyMFoam.C             | 41 ++++++++-----------
 .../pimpleDyMFoam/readControls.H              | 15 ++-----
 .../general/include/createTimeControls.H      | 41 +++++++++++++++++++
 .../general/include/readTimeControls.H        | 14 +++----
 8 files changed, 85 insertions(+), 63 deletions(-)
 create mode 100644 applications/solvers/incompressible/pimpleDyMFoam/createControls.H
 create mode 100644 src/finiteVolume/cfdTools/general/include/createTimeControls.H

diff --git a/applications/solvers/incompressible/pimpleDyMFoam/UEqn.H b/applications/solvers/incompressible/pimpleDyMFoam/UEqn.H
index 6aa608d3a..84c71fc36 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/UEqn.H
+++ b/applications/solvers/incompressible/pimpleDyMFoam/UEqn.H
@@ -5,23 +5,12 @@
       + turbulence->divDevReff(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().relaxationFactor(U.select(pimple.finalIter()))
+    );
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
     }
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H b/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
index aa99200c4..6246f259f 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
@@ -37,7 +37,7 @@
 
     mesh.schemesDict().setFluxRequired(pcorr.name());
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pcorrEqn
         (
@@ -47,7 +47,7 @@
         pcorrEqn.setReference(pRefCell, pRefValue);
         pcorrEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi -= pcorrEqn.flux();
         }
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/createControls.H b/applications/solvers/incompressible/pimpleDyMFoam/createControls.H
new file mode 100644
index 000000000..ca5e25906
--- /dev/null
+++ b/applications/solvers/incompressible/pimpleDyMFoam/createControls.H
@@ -0,0 +1,11 @@
+#include "createTimeControls.H"
+
+bool correctPhi
+(
+    pimple.dict().lookupOrDefault("correctPhi", false)
+);
+
+bool checkMeshCourantNo
+(
+    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
+);
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/createFields.H b/applications/solvers/incompressible/pimpleDyMFoam/createFields.H
index bc798ba98..1925b94be 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/createFields.H
+++ b/applications/solvers/incompressible/pimpleDyMFoam/createFields.H
@@ -33,6 +33,7 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("PIMPLE"), 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 6c24eed98..1ae34775d 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
@@ -36,6 +36,7 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "turbulenceModel.H"
 #include "dynamicFvMesh.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,10 +46,12 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createDynamicFvMesh.H"
-#   include "readPIMPLEControls.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
-#   include "readTimeControls.H"
+#   include "createControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -93,10 +96,9 @@ int main(int argc, char *argv[])
         fvc::makeRelative(phi, U);
 
         // --- PIMPLE loop
-        label oCorr = 0;
-        do
+        while (pimple.loop())
         {
-            if (nOuterCorr != 1)
+            if (!pimple.firstIter())
             {
                 p.storePrevIter();
             }
@@ -104,7 +106,7 @@ int main(int argc, char *argv[])
 #           include "UEqn.H"
 
             // --- PISO loop
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
                 rAU = 1.0/UEqn.A();
 
@@ -114,7 +116,7 @@ int main(int argc, char *argv[])
 
                 adjustPhi(phi, U, p);
 
-                for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+                while (pimple.correctNonOrthogonal())
                 {
                     fvScalarMatrix pEqn
                     (
@@ -123,24 +125,15 @@ int main(int argc, char *argv[])
 
                     pEqn.setReference(pRefCell, pRefValue);
 
-                    if
+                    pEqn.solve
                     (
-//                         oCorr == nOuterCorr - 1
-                        corr == nCorr - 1
-                     && nonOrth == nNonOrthCorr
-                    )
-                    {
-                        pEqn.solve
+                        mesh.solutionDict().solver
                         (
-                            mesh.solutionDict().solver(p.name() + "Final")
-                        );
-                    }
-                    else
-                    {
-                        pEqn.solve(mesh.solutionDict().solver(p.name()));
-                    }
+                            p.select(pimple.finalInnerIter())
+                        )
+                    );
 
-                    if (nonOrth == nNonOrthCorr)
+                    if (pimple.finalNonOrthogonalIter())
                     {
                         phi -= pEqn.flux();
                     }
@@ -149,7 +142,7 @@ int main(int argc, char *argv[])
 #               include "continuityErrs.H"
 
                 // Explicitly relax pressure for momentum corrector
-                if (oCorr != nOuterCorr - 1)
+                if (!pimple.finalIter())
                 {
                     p.relax();
                 }
@@ -164,7 +157,7 @@ int main(int argc, char *argv[])
             }
 
             turbulence->correct();
-        } while (++oCorr < nOuterCorr);
+        }
 
         runTime.write();
 
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/readControls.H b/applications/solvers/incompressible/pimpleDyMFoam/readControls.H
index 3bd20c5c5..9f982e260 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/readControls.H
+++ b/applications/solvers/incompressible/pimpleDyMFoam/readControls.H
@@ -1,14 +1,5 @@
-#   include "readTimeControls.H"
-#   include "readPIMPLEControls.H"
+#include "readTimeControls.H"
 
-    bool correctPhi = false;
-    if (pimple.found("correctPhi"))
-    {
-        correctPhi = Switch(pimple.lookup("correctPhi"));
-    }
+correctPhi = pimple.dict().lookupOrDefault("correctPhi", false);
 
-    bool checkMeshCourantNo = false;
-    if (pimple.found("checkMeshCourantNo"))
-    {
-        checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo"));
-    }
+checkMeshCourantNo = pimple.dict().lookupOrDefault("checkMeshCourantNo", false);
diff --git a/src/finiteVolume/cfdTools/general/include/createTimeControls.H b/src/finiteVolume/cfdTools/general/include/createTimeControls.H
new file mode 100644
index 000000000..b948f1955
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/include/createTimeControls.H
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+Global
+    readTimeControls
+
+Description
+    Read the control parameters used by setDeltaT
+
+\*---------------------------------------------------------------------------*/
+
+bool adjustTimeStep =
+    runTime.controlDict().lookupOrDefault("adjustTimeStep", false);
+
+scalar maxCo =
+    runTime.controlDict().lookupOrDefault<scalar>("maxCo", 1.0);
+
+scalar maxDeltaT =
+    runTime.controlDict().lookupOrDefault<scalar>("maxDeltaT", GREAT);
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/include/readTimeControls.H b/src/finiteVolume/cfdTools/general/include/readTimeControls.H
index 46a0d8504..4ea4ea232 100644
--- a/src/finiteVolume/cfdTools/general/include/readTimeControls.H
+++ b/src/finiteVolume/cfdTools/general/include/readTimeControls.H
@@ -29,17 +29,13 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-Switch adjustTimeStep
-(
-    runTime.controlDict().lookup("adjustTimeStep")
-);
+adjustTimeStep =
+    runTime.controlDict().lookupOrDefault("adjustTimeStep", false);
 
-scalar maxCo
-(
-    readScalar(runTime.controlDict().lookup("maxCo"))
-);
+maxCo =
+    runTime.controlDict().lookupOrDefault<scalar>("maxCo", 1.0);
 
-scalar maxDeltaT =
+maxDeltaT =
     runTime.controlDict().lookupOrDefault<scalar>("maxDeltaT", GREAT);
 
 // ************************************************************************* //

From 1e8bd24dc72dc42f4906cc14de075bf6104f959a Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Fri, 6 May 2016 23:31:48 +0200
Subject: [PATCH 39/55] Modified to work with backported createTimeControl.H
 from OF 3.0.1

---
 .../solvers/combustion/PDRFoam/PDRFoam.C      |  2 +-
 .../combustion/PDRFoam/PDRFoamAutoRefine.C    |  2 +-
 .../solvers/combustion/XiFoam/XiFoam.C        |  2 +-
 .../coldEngineFoam/coldEngineFoam.C           |  1 +
 .../dieselEngineFoam/dieselEngineFoam.C       |  1 +
 .../combustion/dieselFoam/dieselFoam.C        |  2 +-
 .../combustion/engineFoam/engineFoam.C        |  1 +
 .../solvers/combustion/fireFoam/fireFoam.C    |  2 +-
 .../combustion/reactingFoam/reactingFoam.C    |  2 +-
 .../rhoReactingFoam/rhoReactingFoam.C         |  2 +-
 .../solvers/compressible/dbnsFoam/dbnsFoam.C  |  1 +
 .../compressible/dbnsTurbFoam/dbnsTurbFoam.C  |  1 +
 .../rhoCentralFoam/rhoCentralFoam.C           |  2 +-
 .../rhoPimpleFoam/rhoPimpleFoam.C             |  1 +
 .../compressible/rhoPisoFoam/rhoPisoFoam.C    |  2 +-
 .../rhoPorousMRFPimpleFoam.C                  |  1 +
 .../rhopSonicFoam/rhopSonicFoam.C             |  1 +
 .../sonicDyMFoam/createControls.H             | 14 ++++++++++
 .../compressible/sonicDyMFoam/readControls.H  |  4 +--
 .../compressible/sonicDyMFoam/sonicDyMFoam.C  |  1 +
 .../compressible/sonicFoam/sonicFoam.C        |  1 +
 .../conjugateHeatFoam/conjugateHeatFoam.C     |  2 +-
 .../engine/icoDyMEngineFoam/createControls.H  |  6 +++++
 .../icoDyMEngineFoam/icoDyMEngineFoam.C       |  1 +
 .../engine/icoDyMEngineFoam/readControls.H    |  6 ++---
 .../readEngineTimeControls.H                  |  2 +-
 .../sonicTurbDyMEngineFoam.C                  |  1 +
 .../engine/turbDyMEngineFoam/createControls.H |  8 ++++++
 .../engine/turbDyMEngineFoam/readControls.H   |  2 +-
 .../turbDyMEngineFoam/turbDyMEngineFoam.C     |  1 +
 .../liquidFilmFoam/liquidFilmFoam.C           |  1 +
 .../buoyantBoussinesqPisoFoam.C               |  2 +-
 .../buoyantPisoFoam/buoyantPisoFoam.C         |  2 +-
 .../chtMultiRegionFoam/chtMultiRegionFoam.C   |  2 +-
 .../interIbFoam/interIbFoam.C                 |  2 +-
 .../icoDyMFoam/createControls.H               | 11 ++++++++
 .../incompressible/icoDyMFoam/icoDyMFoam.C    |  1 +
 .../incompressible/icoDyMFoam/readControls.H  | 12 +++------
 .../icoDyMSimpleFoam/createControls.H         | 11 ++++++++
 .../icoDyMSimpleFoam/icoDyMSimpleFoam.C       |  1 +
 .../icoDyMSimpleFoam/readControls.H           | 12 +++------
 .../incompressible/pimpleFoam/pimpleFoam.C    |  1 +
 .../coalChemistryFoam/coalChemistryFoam.C     |  2 +-
 .../porousExplicitSourceReactingParcelFoam.C  |  2 +-
 .../reactingParcelFoam/reactingParcelFoam.C   |  2 +-
 .../multiphase/MRFInterFoam/MRFInterFoam.C    |  2 +-
 .../cavitatingFoam/cavitatingFoam.C           |  2 +-
 .../cavitatingFoam/createControls.H           |  6 +++++
 .../multiphase/cavitatingFoam/readControls.H  |  6 +----
 .../compressibleInterDyMFoam.C                |  2 +-
 .../compressibleInterDyMFoam/createControls.H | 27 +++++++++++++++++++
 .../compressibleInterDyMFoam/readControls.H   |  9 +++----
 .../compressibleInterFoam.C                   |  2 +-
 .../compressibleInterFoam/createControls.H    | 15 +++++++++++
 .../compressibleInterFoam/readControls.H      |  5 +---
 .../multiphase/interDyMFoam/createControls.H  | 13 +++++++++
 .../multiphase/interDyMFoam/interDyMFoam.C    |  2 +-
 .../multiphase/interDyMFoam/readControls.H    |  4 +--
 .../solvers/multiphase/interFoam/interFoam.C  |  2 +-
 .../interMixingFoam/interMixingFoam.C         |  2 +-
 .../interPhaseChangeFoam.C                    |  2 +-
 .../multiphaseInterFoam/multiphaseInterFoam.C |  4 +--
 .../porousInterFoam/porousInterFoam.C         |  2 +-
 .../twoLiquidMixingFoam/twoLiquidMixingFoam.C |  2 +-
 .../twoPhaseEulerFoam/twoPhaseEulerFoam.C     |  2 +-
 .../deprecatedSolvers/icoFsiFoam/icoFsiFoam.C |  2 +-
 .../viscoelasticFluidFoam.C                   |  1 +
 67 files changed, 179 insertions(+), 74 deletions(-)
 create mode 100644 applications/solvers/compressible/sonicDyMFoam/createControls.H
 create mode 100644 applications/solvers/engine/icoDyMEngineFoam/createControls.H
 create mode 100644 applications/solvers/engine/turbDyMEngineFoam/createControls.H
 create mode 100644 applications/solvers/incompressible/icoDyMFoam/createControls.H
 create mode 100644 applications/solvers/incompressible/icoDyMSimpleFoam/createControls.H
 create mode 100644 applications/solvers/multiphase/cavitatingFoam/createControls.H
 create mode 100644 applications/solvers/multiphase/compressibleInterDyMFoam/createControls.H
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/createControls.H
 create mode 100644 applications/solvers/multiphase/interDyMFoam/createControls.H

diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index 8edcd7c22..e3a5e8c1f 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index f542abffa..fee3bd322 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
 #   include "createFields.H"
 #   include "readPISOControls.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "setInitialDeltaT.H"
 
     scalar StCoNum = 0.0;
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index bde07e52e..c652e2624 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
index b3548e94b..747b035f1 100644
--- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
+++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
@@ -46,6 +46,7 @@ int main(int argc, char *argv[])
 #   include "createEngineMesh.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
+#   include "createTimeControls.H"
 #   include "readEngineTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"
diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index 5fc450ff3..0389733d0 100644
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@@ -55,6 +55,7 @@ int main(int argc, char *argv[])
 #   include "readCombustionProperties.H"
 #   include "createSpray.H"
 #   include "initContinuityErrs.H"
+#   include "createTimeControls.H"
 #   include "readEngineTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index eed49a1b4..f29fe4d45 100644
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
 #   include "readCombustionProperties.H"
 #   include "createSpray.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C
index e225fb823..56b487bf8 100644
--- a/applications/solvers/combustion/engineFoam/engineFoam.C
+++ b/applications/solvers/combustion/engineFoam/engineFoam.C
@@ -69,6 +69,7 @@ int main(int argc, char *argv[])
 #   include "readCombustionProperties.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
+#   include "createTimeControls.H"
 #   include "readEngineTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"
diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C
index de2aae539..83cedd60b 100644
--- a/applications/solvers/combustion/fireFoam/fireFoam.C
+++ b/applications/solvers/combustion/fireFoam/fireFoam.C
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "createRadiationModel.H"
-    #include "readTimeControls.H"
+    #include "createTimeControls.H"
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 6621bec64..0b7bd2f8c 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
index a4d95b90f..dc729c5f3 100644
--- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/compressible/dbnsFoam/dbnsFoam.C b/applications/solvers/compressible/dbnsFoam/dbnsFoam.C
index 3d0ce5d4f..240b9e512 100644
--- a/applications/solvers/compressible/dbnsFoam/dbnsFoam.C
+++ b/applications/solvers/compressible/dbnsFoam/dbnsFoam.C
@@ -54,6 +54,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createMesh.H"
 #   include "createFields.H"
+#   include "createTimeControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/compressible/dbnsTurbFoam/dbnsTurbFoam.C b/applications/solvers/compressible/dbnsTurbFoam/dbnsTurbFoam.C
index 28eec5579..acd6b1af9 100644
--- a/applications/solvers/compressible/dbnsTurbFoam/dbnsTurbFoam.C
+++ b/applications/solvers/compressible/dbnsTurbFoam/dbnsTurbFoam.C
@@ -55,6 +55,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createMesh.H"
 #   include "createFields.H"
+#   include "createTimeControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
index 90ff89d88..e2a277ca1 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 #   include "createMesh.H"
 #   include "createFields.H"
 #   include "readThermophysicalProperties.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index e142e3d37..a5e65d9ed 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
+    #include "createTimeControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C b/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
index d3f1f19c9..279173b5c 100644
--- a/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
+++ b/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
-    #include "readTimeControls.H"
+    #include "createTimeControls.H"
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
index 4d608296a..a097479ae 100644
--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
+    #include "createTimeControls.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
index fff8b8fae..5d1e32170 100644
--- a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
+++ b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
 #   include "createMesh.H"
 #   include "readThermodynamicProperties.H"
 #   include "createFields.H"
+#   include "createTimeControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/compressible/sonicDyMFoam/createControls.H b/applications/solvers/compressible/sonicDyMFoam/createControls.H
new file mode 100644
index 000000000..45a18790e
--- /dev/null
+++ b/applications/solvers/compressible/sonicDyMFoam/createControls.H
@@ -0,0 +1,14 @@
+#   include "createTimeControls.H"
+#   include "readPIMPLEControls.H"
+
+    bool correctPhi = false;
+    if (pimple.found("correctPhi"))
+    {
+        correctPhi = Switch(pimple.lookup("correctPhi"));
+    }
+
+    bool checkMeshCourantNo = false;
+    if (pimple.found("checkMeshCourantNo"))
+    {
+        checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo"));
+    }
diff --git a/applications/solvers/compressible/sonicDyMFoam/readControls.H b/applications/solvers/compressible/sonicDyMFoam/readControls.H
index 3bd20c5c5..2db7f5142 100644
--- a/applications/solvers/compressible/sonicDyMFoam/readControls.H
+++ b/applications/solvers/compressible/sonicDyMFoam/readControls.H
@@ -1,13 +1,13 @@
 #   include "readTimeControls.H"
 #   include "readPIMPLEControls.H"
 
-    bool correctPhi = false;
+    correctPhi = false;
     if (pimple.found("correctPhi"))
     {
         correctPhi = Switch(pimple.lookup("correctPhi"));
     }
 
-    bool checkMeshCourantNo = false;
+    checkMeshCourantNo = false;
     if (pimple.found("checkMeshCourantNo"))
     {
         checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo"));
diff --git a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
index 5e39f5db8..0920a9542 100644
--- a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
@@ -58,6 +58,7 @@ int main(int argc, char *argv[])
 #   include "createDynamicFvMesh.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
+#   include "createControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C
index 94bcdf7a3..fb11a64bc 100644
--- a/applications/solvers/compressible/sonicFoam/sonicFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C
@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 #   include "createMesh.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
+#   include "createTimeControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatFoam.C b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatFoam.C
index 7366b5618..89bfc93d2 100644
--- a/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatFoam.C
+++ b/applications/solvers/coupled/conjugateHeatFoam/conjugateHeatFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
 #   include "createFields.H"
 #   include "createSolidFields.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/engine/icoDyMEngineFoam/createControls.H b/applications/solvers/engine/icoDyMEngineFoam/createControls.H
new file mode 100644
index 000000000..4c5fbcabb
--- /dev/null
+++ b/applications/solvers/engine/icoDyMEngineFoam/createControls.H
@@ -0,0 +1,6 @@
+#   include "createTimeControls.H"
+
+    bool checkMeshCourantNo
+    (
+        piso.dict().lookupOrDefault("checkMeshCourantNo", false)
+    );
diff --git a/applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C b/applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C
index f878585b2..7d9360bd1 100644
--- a/applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C
+++ b/applications/solvers/engine/icoDyMEngineFoam/icoDyMEngineFoam.C
@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
 
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
+#   include "createControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/engine/icoDyMEngineFoam/readControls.H b/applications/solvers/engine/icoDyMEngineFoam/readControls.H
index 95c6c4098..e310b9020 100644
--- a/applications/solvers/engine/icoDyMEngineFoam/readControls.H
+++ b/applications/solvers/engine/icoDyMEngineFoam/readControls.H
@@ -1,6 +1,4 @@
 #   include "readTimeControls.H"
 
-    bool checkMeshCourantNo
-    (
-        piso.dict().lookupOrDefault("checkMeshCourantNo", false)
-    );
+    checkMeshCourantNo =
+        piso.dict().lookupOrDefault("checkMeshCourantNo", false);
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/readEngineTimeControls.H b/applications/solvers/engine/sonicTurbDyMEngineFoam/readEngineTimeControls.H
index 2aea3445e..069e75e2c 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/readEngineTimeControls.H
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/readEngineTimeControls.H
@@ -1,3 +1,3 @@
-#include "readTimeControls.H"
+#   include "readTimeControls.H"
 
     maxDeltaT = runTime.userTimeToTime(maxDeltaT);
diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C b/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C
index 52354be7d..04225e83b 100644
--- a/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C
+++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/sonicTurbDyMEngineFoam.C
@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 #   include "readPIMPLEControls.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
+#   include "createTimeControls.H"
 #   include "readEngineTimeControls.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
diff --git a/applications/solvers/engine/turbDyMEngineFoam/createControls.H b/applications/solvers/engine/turbDyMEngineFoam/createControls.H
new file mode 100644
index 000000000..d76028fda
--- /dev/null
+++ b/applications/solvers/engine/turbDyMEngineFoam/createControls.H
@@ -0,0 +1,8 @@
+#   include "createTimeControls.H"
+#   include "readPISOControls.H"
+
+    bool checkMeshCourantNo = false;
+    if (piso.found("checkMeshCourantNo"))
+    {
+        checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
+    }
diff --git a/applications/solvers/engine/turbDyMEngineFoam/readControls.H b/applications/solvers/engine/turbDyMEngineFoam/readControls.H
index e4ade2696..375b524f2 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/readControls.H
+++ b/applications/solvers/engine/turbDyMEngineFoam/readControls.H
@@ -1,7 +1,7 @@
 #   include "readTimeControls.H"
 #   include "readPISOControls.H"
 
-    bool checkMeshCourantNo = false;
+    checkMeshCourantNo = false;
     if (piso.found("checkMeshCourantNo"))
     {
         checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
diff --git a/applications/solvers/engine/turbDyMEngineFoam/turbDyMEngineFoam.C b/applications/solvers/engine/turbDyMEngineFoam/turbDyMEngineFoam.C
index 9edd14976..780a16a7f 100644
--- a/applications/solvers/engine/turbDyMEngineFoam/turbDyMEngineFoam.C
+++ b/applications/solvers/engine/turbDyMEngineFoam/turbDyMEngineFoam.C
@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
 #   include "createDynamicFvMesh.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
+#   include "createControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C b/applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C
index 5456eb1f9..aa9c86f86 100644
--- a/applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C
+++ b/applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 #   include "readTransportProperties.H"
 #   include "createFaFields.H"
 #   include "createFvFields.H"
+#   include "createTimeControls.H"
 
     Info << "\nStarting time loop\n" << endl;
 
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
index 6b2f532bb..73547b6a3 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
index f50884876..2a277a9bf 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
index 07a7e48df..c617411b5 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
 
     #include "initContinuityErrs.H"
 
-    #include "readTimeControls.H"
+    #include "createTimeControls.H"
     #include "readSolidTimeControls.H"
 
 
diff --git a/applications/solvers/immersedBoundary/interIbFoam/interIbFoam.C b/applications/solvers/immersedBoundary/interIbFoam/interIbFoam.C
index 3e55867d0..5ea2a8744 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/interIbFoam.C
+++ b/applications/solvers/immersedBoundary/interIbFoam/interIbFoam.C
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
 #   include "createIbMasks.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "correctPhi.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
diff --git a/applications/solvers/incompressible/icoDyMFoam/createControls.H b/applications/solvers/incompressible/icoDyMFoam/createControls.H
new file mode 100644
index 000000000..63d39deef
--- /dev/null
+++ b/applications/solvers/incompressible/icoDyMFoam/createControls.H
@@ -0,0 +1,11 @@
+#include "createTimeControls.H"
+
+bool correctPhi
+(
+    piso.dict().lookupOrDefault("correctPhi", false)
+);
+
+bool checkMeshCourantNo
+(
+    piso.dict().lookupOrDefault("checkMeshCourantNo", false)
+);
diff --git a/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C b/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C
index 9acf3b2c1..2856512a9 100644
--- a/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C
+++ b/applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C
@@ -50,6 +50,7 @@ int main(int argc, char *argv[])
 #   include "initContinuityErrs.H"
 #   include "initTotalVolume.H"
 #   include "createFields.H"
+#   include "createControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/incompressible/icoDyMFoam/readControls.H b/applications/solvers/incompressible/icoDyMFoam/readControls.H
index a6b4cce58..7cc9b3071 100644
--- a/applications/solvers/incompressible/icoDyMFoam/readControls.H
+++ b/applications/solvers/incompressible/icoDyMFoam/readControls.H
@@ -1,11 +1,5 @@
-#   include "readTimeControls.H"
+#include "readTimeControls.H"
 
-    bool correctPhi
-    (
-        piso.dict().lookupOrDefault("correctPhi", false)
-    );
+correctPhi = piso.dict().lookupOrDefault("correctPhi", false);
 
-    bool checkMeshCourantNo
-    (
-        piso.dict().lookupOrDefault("checkMeshCourantNo", false)
-    );
+checkMeshCourantNo = piso.dict().lookupOrDefault("checkMeshCourantNo", false);
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/createControls.H b/applications/solvers/incompressible/icoDyMSimpleFoam/createControls.H
new file mode 100644
index 000000000..63d39deef
--- /dev/null
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/createControls.H
@@ -0,0 +1,11 @@
+#include "createTimeControls.H"
+
+bool correctPhi
+(
+    piso.dict().lookupOrDefault("correctPhi", false)
+);
+
+bool checkMeshCourantNo
+(
+    piso.dict().lookupOrDefault("checkMeshCourantNo", false)
+);
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C b/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
index f72d5a7e3..f6beebb7d 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/icoDyMSimpleFoam.C
@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
 #   include "initContinuityErrs.H"
 #   include "initTotalVolume.H"
 #   include "createFields.H"
+#   include "createControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/readControls.H b/applications/solvers/incompressible/icoDyMSimpleFoam/readControls.H
index a6b4cce58..7cc9b3071 100644
--- a/applications/solvers/incompressible/icoDyMSimpleFoam/readControls.H
+++ b/applications/solvers/incompressible/icoDyMSimpleFoam/readControls.H
@@ -1,11 +1,5 @@
-#   include "readTimeControls.H"
+#include "readTimeControls.H"
 
-    bool correctPhi
-    (
-        piso.dict().lookupOrDefault("correctPhi", false)
-    );
+correctPhi = piso.dict().lookupOrDefault("correctPhi", false);
 
-    bool checkMeshCourantNo
-    (
-        piso.dict().lookupOrDefault("checkMeshCourantNo", false)
-    );
+checkMeshCourantNo = piso.dict().lookupOrDefault("checkMeshCourantNo", false);
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index 0cd40d631..33836621f 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
+#   include "createTimeControls.H"
 
     Info<< "\nStarting time loop\n" << endl;
 
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index 1f7742c9e..4d031e521 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
     #include "createClouds.H"
     #include "createRadiationModel.H"
     #include "initContinuityErrs.H"
-    #include "readTimeControls.H"
+    #include "createTimeControls.H"
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
index b05b7eca0..de63f2fbb 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
     #include "createExplicitSources.H"
     #include "createPorousZones.H"
     #include "initContinuityErrs.H"
-    #include "readTimeControls.H"
+    #include "createTimeControls.H"
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
index f80f4b2a7..154774cca 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
     #include "createClouds.H"
     #include "createRadiationModel.H"
     #include "initContinuityErrs.H"
-    #include "readTimeControls.H"
+    #include "createTimeControls.H"
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/multiphase/MRFInterFoam/MRFInterFoam.C b/applications/solvers/multiphase/MRFInterFoam/MRFInterFoam.C
index 2e0b58796..d4374d687 100644
--- a/applications/solvers/multiphase/MRFInterFoam/MRFInterFoam.C
+++ b/applications/solvers/multiphase/MRFInterFoam/MRFInterFoam.C
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "createMRFZones.H"
-    #include "readTimeControls.H"
+    #include "createTimeControls.H"
     #include "correctPhi.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index ca96427ac..ff40c6ade 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createMesh.H"
 #   include "readThermodynamicProperties.H"
-#   include "readControls.H"
+#   include "createControls.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 #   include "compressibleCourantNo.H"
diff --git a/applications/solvers/multiphase/cavitatingFoam/createControls.H b/applications/solvers/multiphase/cavitatingFoam/createControls.H
new file mode 100644
index 000000000..e5c7eea9f
--- /dev/null
+++ b/applications/solvers/multiphase/cavitatingFoam/createControls.H
@@ -0,0 +1,6 @@
+#include "createTimeControls.H"
+
+scalar maxAcousticCo
+(
+    readScalar(runTime.controlDict().lookup("maxAcousticCo"))
+);
diff --git a/applications/solvers/multiphase/cavitatingFoam/readControls.H b/applications/solvers/multiphase/cavitatingFoam/readControls.H
index f53e7b9eb..d4206bef4 100644
--- a/applications/solvers/multiphase/cavitatingFoam/readControls.H
+++ b/applications/solvers/multiphase/cavitatingFoam/readControls.H
@@ -1,9 +1,5 @@
 #include "readTimeControls.H"
 
-scalar maxAcousticCo
-(
-    readScalar(runTime.controlDict().lookup("maxAcousticCo"))
-);
-
+maxAcousticCo = readScalar(runTime.controlDict().lookup("maxAcousticCo"));
 
 #include "readPISOControls.H"
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index b0857511a..515d3c89f 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
     #include "readGravitationalAcceleration.H"
-    #include "readControls.H"
+    #include "createControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "CourantNo.H"
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/createControls.H b/applications/solvers/multiphase/compressibleInterDyMFoam/createControls.H
new file mode 100644
index 000000000..d237eefb7
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/createControls.H
@@ -0,0 +1,27 @@
+   #include "readPISOControls.H"
+   #include "createTimeControls.H"
+
+    label nAlphaSubCycles
+    (
+        readLabel(piso.lookup("nAlphaSubCycles"))
+    );
+
+    if (nAlphaSubCycles > 1 && nOuterCorr != 1)
+    {
+        FatalErrorIn(args.executable())
+            << "Sub-cycling alpha is only allowed for PISO, "
+               "i.e. when the number of outer-correctors = 1"
+            << exit(FatalError);
+    }
+
+    bool correctPhi = true;
+    if (piso.found("correctPhi"))
+    {
+        correctPhi = Switch(piso.lookup("correctPhi"));
+    }
+
+    bool checkMeshCourantNo = false;
+    if (piso.found("checkMeshCourantNo"))
+    {
+        checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
+    }
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H b/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
index 440c8a473..bd209aef2 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/readControls.H
@@ -1,10 +1,7 @@
    #include "readPISOControls.H"
    #include "readTimeControls.H"
 
-    label nAlphaSubCycles
-    (
-        readLabel(piso.lookup("nAlphaSubCycles"))
-    );
+    nAlphaSubCycles = readLabel(piso.lookup("nAlphaSubCycles"));
 
     if (nAlphaSubCycles > 1 && nOuterCorr != 1)
     {
@@ -14,13 +11,13 @@
             << exit(FatalError);
     }
 
-    bool correctPhi = true;
+    correctPhi = true;
     if (piso.found("correctPhi"))
     {
         correctPhi = Switch(piso.lookup("correctPhi"));
     }
 
-    bool checkMeshCourantNo = false;
+    checkMeshCourantNo = false;
     if (piso.found("checkMeshCourantNo"))
     {
         checkMeshCourantNo = Switch(piso.lookup("checkMeshCourantNo"));
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index 46c961e40..2469bda8c 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
-    #include "readControls.H"
+    #include "createControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "CourantNo.H"
diff --git a/applications/solvers/multiphase/compressibleInterFoam/createControls.H b/applications/solvers/multiphase/compressibleInterFoam/createControls.H
new file mode 100644
index 000000000..f66279fee
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/createControls.H
@@ -0,0 +1,15 @@
+   #include "readPISOControls.H"
+   #include "createTimeControls.H"
+
+    label nAlphaSubCycles
+    (
+        readLabel(piso.lookup("nAlphaSubCycles"))
+    );
+
+    if (nAlphaSubCycles > 1 && nOuterCorr != 1)
+    {
+        FatalErrorIn(args.executable())
+            << "Sub-cycling alpha is only allowed for PISO, "
+               "i.e. when the number of outer-correctors = 1"
+            << exit(FatalError);
+    }
diff --git a/applications/solvers/multiphase/compressibleInterFoam/readControls.H b/applications/solvers/multiphase/compressibleInterFoam/readControls.H
index 0c8d35532..10af30422 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/readControls.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/readControls.H
@@ -1,10 +1,7 @@
    #include "readPISOControls.H"
    #include "readTimeControls.H"
 
-    label nAlphaSubCycles
-    (
-        readLabel(piso.lookup("nAlphaSubCycles"))
-    );
+    nAlphaSubCycles = readLabel(piso.lookup("nAlphaSubCycles"));
 
     if (nAlphaSubCycles > 1 && nOuterCorr != 1)
     {
diff --git a/applications/solvers/multiphase/interDyMFoam/createControls.H b/applications/solvers/multiphase/interDyMFoam/createControls.H
new file mode 100644
index 000000000..b52e0509a
--- /dev/null
+++ b/applications/solvers/multiphase/interDyMFoam/createControls.H
@@ -0,0 +1,13 @@
+#   include "createTimeControls.H"
+
+    bool correctPhi = true;
+    if (pimple.found("correctPhi"))
+    {
+        correctPhi = Switch(pimple.lookup("correctPhi"));
+    }
+
+    bool checkMeshCourantNo = false;
+    if (pimple.found("checkMeshCourantNo"))
+    {
+        checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo"));
+    }
diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
index 4e3d84eba..6315063a9 100644
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
 #   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
-#   include "readTimeControls.H"
+#   include "createControls.H"
 #   include "correctPhi.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
diff --git a/applications/solvers/multiphase/interDyMFoam/readControls.H b/applications/solvers/multiphase/interDyMFoam/readControls.H
index 7fa49c883..b3b4512c3 100644
--- a/applications/solvers/multiphase/interDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/interDyMFoam/readControls.H
@@ -1,13 +1,13 @@
 #   include "readTimeControls.H"
 #   include "readPIMPLEControls.H"
 
-    bool correctPhi = true;
+    correctPhi = true;
     if (pimple.found("correctPhi"))
     {
         correctPhi = Switch(pimple.lookup("correctPhi"));
     }
 
-    bool checkMeshCourantNo = false;
+    checkMeshCourantNo = false;
     if (pimple.found("checkMeshCourantNo"))
     {
         checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo"));
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index cbb420360..c5bdc49ea 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
 #   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "correctPhi.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
diff --git a/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
index 02ac6db10..44de8ab5e 100644
--- a/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
+++ b/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 #   include "readPISOControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
 #   include "correctPhi.H"
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index ffe8f3ee1..de7b70221 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
 #   include "readPISOControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "correctPhi.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index 46fc206c6..d85538315 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -43,11 +43,11 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
-    #include "readGravitationalAcceleration.H"
+#   include "readGravitationalAcceleration.H"
 #   include "readPISOControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "correctPhi.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
diff --git a/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C b/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C
index 3a8d02bb3..6976ea5a9 100644
--- a/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C
+++ b/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
 #   include "createPorousZones.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "correctPhi.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index 5e9e947db..861a0b0d3 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 #   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index 12b74345c..321829c31 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
 #   include "createFields.H"
 #   include "readPPProperties.H"
 #   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 #   include "CourantNo.H"
 #   include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/icoFsiFoam.C b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/icoFsiFoam.C
index 5ed358c5a..edb207fb7 100644
--- a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/icoFsiFoam.C
+++ b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/icoFsiFoam.C
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
 #   include "createStressFields.H"
 #   include "readMechanicalProperties.H"
 #   include "readCouplingProperties.H"
-#   include "readTimeControls.H"
+#   include "createTimeControls.H"
 
 #   include "initContinuityErrs.H"
 
diff --git a/applications/solvers/viscoelastic/viscoelasticFluidFoam/viscoelasticFluidFoam.C b/applications/solvers/viscoelastic/viscoelasticFluidFoam/viscoelasticFluidFoam.C
index 1e1223dc7..6c764b22a 100644
--- a/applications/solvers/viscoelastic/viscoelasticFluidFoam/viscoelasticFluidFoam.C
+++ b/applications/solvers/viscoelastic/viscoelasticFluidFoam/viscoelasticFluidFoam.C
@@ -46,6 +46,7 @@ int main(int argc, char *argv[])
 #   include "createMesh.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
+#   include "createTimeControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From 802b13cacfc158ce43da259a9bf6d430f864997f Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sat, 7 May 2016 08:04:39 +0200
Subject: [PATCH 40/55] Fixed tutorials for pimpleDyMFoam solver (backports)

---
 .../axialTurbine/system/fvSchemes             |  9 +--
 .../movingCone/constant/polyMesh/boundary     |  6 +-
 .../pimpleDyMFoam/movingCone/system/fvSchemes |  9 +--
 .../movingCone/system/fvSolution              |  6 ++
 .../movingCylinders/system/fvSchemes          |  9 +--
 .../movingCylinders/system/fvSolution         |  4 +-
 .../pimpleDyMFoam/wingMotion/Allclean         |  6 +-
 .../constant/polyMesh/boundary                | 58 -------------------
 .../system/fvSchemes                          |  8 +--
 .../system/fvSolution                         |  1 +
 .../constant/polyMesh/boundary                | 58 -------------------
 .../wingMotion2D_simpleFoam/system/fvSchemes  |  8 +--
 .../constant/polyMesh/boundary                | 52 -----------------
 .../wingMotion_snappyHexMesh/system/fvSchemes |  8 +--
 .../pimpleFoam/t-junction/system/fvSchemes    |  8 +--
 .../pimpleFoam/t-junction/system/fvSolution   |  1 +
 16 files changed, 24 insertions(+), 227 deletions(-)
 delete mode 100644 tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary
 delete mode 100644 tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary
 delete mode 100644 tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/boundary

diff --git a/tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSchemes
index 22e3666b1..6867412e0 100644
--- a/tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,U)      Gauss linearUpwind Gauss linear;
     div(phi,k)      Gauss linearUpwind Gauss linear;
     div(phi,epsilon) Gauss linearUpwind Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -67,11 +67,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    //pcorr           ;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary
index 205f33ee8..cb68f1b1d 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/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
 {
@@ -37,7 +37,7 @@ FoamFile
     }
     axis
     {
-        type            symmetryPlane;
+        type            empty;
         nFaces          0;
         startFace       3835;
     }
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
index b55d4e0a1..c592cf6dd 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -54,11 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pcorr           ;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
index e610ff1b1..69fbb6265 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
@@ -65,4 +65,10 @@ PIMPLE
     nNonOrthogonalCorrectors 0;
 }
 
+relaxationFactors
+{
+    U       1;
+    UFinal  1;
+}
+
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSchemes
index 0ac0eb72a..885d0128b 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSchemes
@@ -29,7 +29,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss upwind;
-    div((nuEff*dev(grad(U).T())))  Gauss linear;
+    div((nuEff*dev2(T(grad(U)))))  Gauss linear;
 }
 
 laplacianSchemes
@@ -56,11 +56,4 @@ snGradSchemes
     default         limited 0.5;
 }
 
-fluxRequired
-{
-    default         no;
-    pcorr;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSolution
index f83fbea76..ec303e4fc 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSolution
@@ -79,8 +79,8 @@ SIMPLE
 
 relaxationFactors
 {
-    U 0.7;
-//     p 0.3;
+    U       0.7;
+    UFinal  1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean
index 72d1f489f..a15943cd4 100755
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean
@@ -6,14 +6,16 @@ cd ${0%/*} || exit 1    # run from this directory
 
 cd wingMotion_snappyHexMesh
 cleanCase
-\rm -f front.sMesh
+\rm -f front.sMesh symFront.sMesh
 \rm -f constant/cellLevel constant/pointLevel constant/polyMesh/refinementHistory
-
+rm -f constant/polyMesh/boundary
 
 cd ../wingMotion2D_simpleFoam
+rm -f constant/polyMesh/boundary
 cleanCase
 
 cd ../wingMotion2D_pimpleDyMFoam
 cleanCase
+rm -f constant/polyMesh/boundary
 rm -rf 0
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary
deleted file mode 100644
index 62020026c..000000000
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- 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       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    topAndBottom
-    {
-        type            patch;
-        nFaces          150;
-        startFace       76473;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          48;
-        startFace       76623;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          48;
-        startFace       76671;
-    }
-    wing
-    {
-        type            wall;
-        nFaces          778;
-        startFace       76719;
-    }
-    back
-    {
-        type            empty;
-        nFaces          38129;
-        startFace       77497;
-    }
-    front
-    {
-        type            empty;
-        nFaces          38129;
-        startFace       115626;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
index c5b8887e0..40ff0d6c9 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,U)      Gauss linearUpwind Gauss linear;
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,omega)  Gauss limitedLinear 1;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
index 43cb7e71f..850c180fb 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
@@ -76,6 +76,7 @@ relaxationFactors
 {
     p               0.3;
     U               0.7;
+    UFinal          1.0;
     k               0.7;
     omega           0.7;
 }
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary
deleted file mode 100644
index 62020026c..000000000
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- 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       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    topAndBottom
-    {
-        type            patch;
-        nFaces          150;
-        startFace       76473;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          48;
-        startFace       76623;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          48;
-        startFace       76671;
-    }
-    wing
-    {
-        type            wall;
-        nFaces          778;
-        startFace       76719;
-    }
-    back
-    {
-        type            empty;
-        nFaces          38129;
-        startFace       77497;
-    }
-    front
-    {
-        type            empty;
-        nFaces          38129;
-        startFace       115626;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
index b0123246f..49fcfeab6 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,U)      Gauss linearUpwind Gauss linear;
     div(phi,k)      Gauss upwind;
     div(phi,omega)  Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/boundary
deleted file mode 100644
index c8f40206f..000000000
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- 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       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    topAndBottom
-    {
-        type            patch;
-        nFaces          150;
-        startFace       7077;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          48;
-        startFace       7227;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          48;
-        startFace       7275;
-    }
-    symFront
-    {
-        type            symmetryPlane;
-        nFaces          3600;
-        startFace       7323;
-    }
-    symBack
-    {
-        type            symmetryPlane;
-        nFaces          3600;
-        startFace       10923;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
index 229cc2cc2..7a4ca464f 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phid,p)     Gauss limitedLinear 1;
     div(phiU,p)     Gauss limitedLinear 1;
     div(phi,e)      Gauss limitedLinear 1;
-    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -60,10 +60,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes
index ca497019e..c989e5b8f 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,R)      Gauss limitedLinear 1;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss limitedLinear 1;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -61,10 +61,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution
index d717f42a0..099beaa03 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution
@@ -86,6 +86,7 @@ PIMPLE
 relaxationFactors
 {
     U               1;
+    UFinal          1;
     k               1;
     epsilon         1;
 }

From a3a524dbe6d89f19c5f5db66f5d48b99cf750ef1 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sat, 7 May 2016 08:14:14 +0200
Subject: [PATCH 41/55] Fixed boundaryFoam tutorials (backports)

---
 .../constant/polyMesh/boundary                |  5 ++-
 .../boundaryLaunderSharma/system/fvSchemes    |  2 +-
 .../constant/polyMesh/boundary                |  4 +-
 .../system/fvSchemes                          |  2 +-
 .../constant/polyMesh/boundary                | 45 +++++++++----------
 .../boundaryWallFunctions/system/fvSchemes    |  2 +-
 6 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary
index c46d0df6b..1e55764d4 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary
@@ -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       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
index 740fc4aa3..08a9f23bc 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
     div(phi,epsilon) Gauss linear;
     div(phi,R)      Gauss linear;
     div(phi,nuTilda) Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/constant/polyMesh/boundary b/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/constant/polyMesh/boundary
index 58f31bee9..c5fcd3a8e 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/constant/polyMesh/boundary
+++ b/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/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/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/system/fvSchemes
index 208083458..0b2ea0e5c 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/system/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
     div(phi,epsilon) Gauss linear;
     div(phi,R)      Gauss linear;
     div(phi,nuTilda) Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 // Laplacian discretisation schemes
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary
index 1bc58cadb..be49adb66 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary
@@ -1,43 +1,40 @@
 /*--------------------------------*- 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       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 3
 (
-lowerWall
-{
-    type wall;
-    physicalType wallFunctions;
-    nFaces 1;
-    startFace 79;
-}
-
-upperWall
-{
-    type wall;
-    physicalType wallFunctions;
-    nFaces 1;
-    startFace 80;
-}
-
-defaultFaces
-{
-    type empty;
-    nFaces 320;
-    startFace 81;
-}
+    lowerWall
+    {
+        type            wall;
+        nFaces          1;
+        startFace       79;
+    }
+    upperWall
+    {
+        type            wall;
+        nFaces          1;
+        startFace       80;
+    }
+    defaultFaces
+    {
+        type            empty;
+        nFaces          320;
+        startFace       81;
+    }
 )
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
index 208083458..0b2ea0e5c 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
     div(phi,epsilon) Gauss linear;
     div(phi,R)      Gauss linear;
     div(phi,nuTilda) Gauss linear;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 // Laplacian discretisation schemes

From d230fff954ba049c2b57e74383b208df58556a5d Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sat, 7 May 2016 08:38:01 +0200
Subject: [PATCH 42/55] Backported MRFSimpleFoam and porousSimpleFoam
 (setFluxRequired, solutionControl)

---
 .../incompressible/MRFSimpleFoam/MRFSimpleFoam.C | 10 ++++++----
 .../incompressible/MRFSimpleFoam/createFields.H  |  2 +-
 .../incompressible/porousSimpleFoam/UEqn.H       |  7 +------
 .../porousSimpleFoam/createFields.H              |  2 +-
 .../incompressible/porousSimpleFoam/pEqn.H       | 16 ++++------------
 .../porousSimpleFoam/porousSimpleFoam.C          |  9 ++++-----
 6 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/applications/solvers/incompressible/MRFSimpleFoam/MRFSimpleFoam.C b/applications/solvers/incompressible/MRFSimpleFoam/MRFSimpleFoam.C
index 00ecd40a5..7bb094647 100644
--- a/applications/solvers/incompressible/MRFSimpleFoam/MRFSimpleFoam.C
+++ b/applications/solvers/incompressible/MRFSimpleFoam/MRFSimpleFoam.C
@@ -34,6 +34,7 @@ Description
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
 #include "incompressible/RAS/RASModel/RASModel.H"
 #include "MRFZones.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,6 +45,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    simpleControl simple(mesh);
+
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 
@@ -55,8 +59,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readSIMPLEControls.H"
-
         p.storePrevIter();
 
         // Pressure-velocity SIMPLE corrector
@@ -84,7 +86,7 @@ int main(int argc, char *argv[])
             adjustPhi(phi, U, p);
 
             // Non-orthogonal pressure corrector loop
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            while (simple.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
@@ -94,7 +96,7 @@ int main(int argc, char *argv[])
                 pEqn.setReference(pRefCell, pRefValue);
                 pEqn.solve();
 
-                if (nonOrth == nNonOrthCorr)
+                if (simple.finalNonOrthogonalIter())
                 {
                     phi -= pEqn.flux();
                 }
diff --git a/applications/solvers/incompressible/MRFSimpleFoam/createFields.H b/applications/solvers/incompressible/MRFSimpleFoam/createFields.H
index 43242a6e3..3a08cae15 100644
--- a/applications/solvers/incompressible/MRFSimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/MRFSimpleFoam/createFields.H
@@ -32,7 +32,7 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
-
+    mesh.schemesDict().setFluxRequired(p.name());
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
diff --git a/applications/solvers/incompressible/porousSimpleFoam/UEqn.H b/applications/solvers/incompressible/porousSimpleFoam/UEqn.H
index 688120809..9cbcd6129 100644
--- a/applications/solvers/incompressible/porousSimpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/porousSimpleFoam/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/incompressible/porousSimpleFoam/createFields.H b/applications/solvers/incompressible/porousSimpleFoam/createFields.H
index 04d57d057..fa4f98151 100644
--- a/applications/solvers/incompressible/porousSimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/porousSimpleFoam/createFields.H
@@ -32,7 +32,7 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
-
+    mesh.schemesDict().setFluxRequired(p.name());
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
diff --git a/applications/solvers/incompressible/porousSimpleFoam/pEqn.H b/applications/solvers/incompressible/porousSimpleFoam/pEqn.H
index e6797cd86..fbe81daee 100644
--- a/applications/solvers/incompressible/porousSimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/porousSimpleFoam/pEqn.H
@@ -11,7 +11,7 @@ UEqn.clear();
 phi = fvc::interpolate(U) & mesh.Sf();
 adjustPhi(phi, U, p);
 
-for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+while (simple.correctNonOrthogonal())
 {
     tmp<fvScalarMatrix> tpEqn;
 
@@ -25,18 +25,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/incompressible/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C
index 310c80c01..c54de64ff 100644
--- a/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C
+++ b/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C
@@ -34,6 +34,7 @@ Description
 #include "singlePhaseTransportModel.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"
 
@@ -53,9 +57,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        #include "readSIMPLEControls.H"
-        #include "initConvergenceCheck.H"
-
         p.storePrevIter();
 
         // Pressure-velocity SIMPLE corrector
@@ -71,8 +72,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;

From 84d7091a5237b260efebe8bad4bbb4cb843c6cef Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sat, 7 May 2016 08:58:44 +0200
Subject: [PATCH 43/55] Fixed MRFSimpleFoam and porousSimpleFoam tutorials
 (backports)

---
 .../MRFSimpleFoam/axialTurbine_ggi/system/fvSchemes       | 8 +-------
 .../axialTurbine_mixingPlane/system/fvSchemes             | 8 +-------
 .../MRFSimpleFoam/mixerVessel2D/system/fvSchemes          | 8 +-------
 .../porousSimpleFoam/angledDuctExplicit/system/fvSchemes  | 8 +-------
 .../porousSimpleFoam/angledDuctImplicit/system/fvSchemes  | 8 +-------
 .../incompressible/porousSimpleFoam/beaverJoseph/0/T      | 4 ++++
 .../incompressible/porousSimpleFoam/beaverJoseph/0/U      | 4 ++++
 .../incompressible/porousSimpleFoam/beaverJoseph/0/p      | 4 ++++
 .../porousSimpleFoam/beaverJoseph/system/fvSchemes        | 8 +-------
 tutorials/incompressible/porousSimpleFoam/porousPlug/0/T  | 4 ++++
 tutorials/incompressible/porousSimpleFoam/porousPlug/0/U  | 4 ++++
 tutorials/incompressible/porousSimpleFoam/porousPlug/0/p  | 4 ++++
 .../porousSimpleFoam/porousPlug/system/fvSchemes          | 8 +-------
 13 files changed, 31 insertions(+), 49 deletions(-)

diff --git a/tutorials/incompressible/MRFSimpleFoam/axialTurbine_ggi/system/fvSchemes b/tutorials/incompressible/MRFSimpleFoam/axialTurbine_ggi/system/fvSchemes
index dc5015135..f83e47a8b 100644
--- a/tutorials/incompressible/MRFSimpleFoam/axialTurbine_ggi/system/fvSchemes
+++ b/tutorials/incompressible/MRFSimpleFoam/axialTurbine_ggi/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,U)      Gauss limitedLinearV 1;
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -55,12 +55,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 mixingPlane
 {
     default         areaAveraging;
diff --git a/tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/system/fvSchemes b/tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/system/fvSchemes
index 84d8f05cb..7910585e5 100644
--- a/tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/system/fvSchemes
+++ b/tutorials/incompressible/MRFSimpleFoam/axialTurbine_mixingPlane/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,U)      Gauss limitedLinearV 1;
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -55,12 +55,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 mixingPlane
 {
     default         areaAveraging;
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSchemes b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSchemes
index d842a293b..c5188449e 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(phi,U)      Gauss limitedLinearV 1;
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -55,10 +55,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
index bb3fe4f18..6ec0683cc 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
@@ -30,7 +30,7 @@ gradSchemes
 divSchemes
 {
     div(phi,U)      Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
 }
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
index bb3fe4f18..6ec0683cc 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
@@ -30,7 +30,7 @@ gradSchemes
 divSchemes
 {
     div(phi,U)      Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
 }
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/beaverJoseph/0/T b/tutorials/incompressible/porousSimpleFoam/beaverJoseph/0/T
index a68c56a13..58c6a0803 100644
--- a/tutorials/incompressible/porousSimpleFoam/beaverJoseph/0/T
+++ b/tutorials/incompressible/porousSimpleFoam/beaverJoseph/0/T
@@ -38,6 +38,10 @@ boundaryField
     {
         type zeroGradient;
     }
+    frontAndBack
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/beaverJoseph/0/U b/tutorials/incompressible/porousSimpleFoam/beaverJoseph/0/U
index a02bcd0b3..4e7644bbe 100644
--- a/tutorials/incompressible/porousSimpleFoam/beaverJoseph/0/U
+++ b/tutorials/incompressible/porousSimpleFoam/beaverJoseph/0/U
@@ -45,6 +45,10 @@ boundaryField
         type            fixedValue;
         value           uniform (0 0 0);
     }
+    frontAndBack
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/beaverJoseph/0/p b/tutorials/incompressible/porousSimpleFoam/beaverJoseph/0/p
index d8cf23780..d737cc548 100644
--- a/tutorials/incompressible/porousSimpleFoam/beaverJoseph/0/p
+++ b/tutorials/incompressible/porousSimpleFoam/beaverJoseph/0/p
@@ -37,6 +37,10 @@ boundaryField
         type            fixedValue;
         value $internalField;
     }
+    frontAndBack
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/beaverJoseph/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/beaverJoseph/system/fvSchemes
index bb3fe4f18..6ec0683cc 100644
--- a/tutorials/incompressible/porousSimpleFoam/beaverJoseph/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/beaverJoseph/system/fvSchemes
@@ -30,7 +30,7 @@ gradSchemes
 divSchemes
 {
     div(phi,U)      Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
 }
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/porousPlug/0/T b/tutorials/incompressible/porousSimpleFoam/porousPlug/0/T
index a68c56a13..4f2711da2 100644
--- a/tutorials/incompressible/porousSimpleFoam/porousPlug/0/T
+++ b/tutorials/incompressible/porousSimpleFoam/porousPlug/0/T
@@ -38,6 +38,10 @@ boundaryField
     {
         type zeroGradient;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/porousPlug/0/U b/tutorials/incompressible/porousSimpleFoam/porousPlug/0/U
index df82aea72..60530c711 100644
--- a/tutorials/incompressible/porousSimpleFoam/porousPlug/0/U
+++ b/tutorials/incompressible/porousSimpleFoam/porousPlug/0/U
@@ -43,6 +43,10 @@ boundaryField
         type            fixedValue;
         value           uniform (0 0 0);
     }
+    defaultFaces
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/porousPlug/0/p b/tutorials/incompressible/porousSimpleFoam/porousPlug/0/p
index d8cf23780..f219d528e 100644
--- a/tutorials/incompressible/porousSimpleFoam/porousPlug/0/p
+++ b/tutorials/incompressible/porousSimpleFoam/porousPlug/0/p
@@ -37,6 +37,10 @@ boundaryField
         type            fixedValue;
         value $internalField;
     }
+    defaultFaces
+    {
+        type            empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/porousPlug/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/porousPlug/system/fvSchemes
index bb3fe4f18..6ec0683cc 100644
--- a/tutorials/incompressible/porousSimpleFoam/porousPlug/system/fvSchemes
+++ b/tutorials/incompressible/porousSimpleFoam/porousPlug/system/fvSchemes
@@ -30,7 +30,7 @@ gradSchemes
 divSchemes
 {
     div(phi,U)      Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
 }
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //

From 70a11cfd8539d23ebaafa4de92922da40bbd2bc3 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sat, 7 May 2016 09:06:25 +0200
Subject: [PATCH 44/55] Backported simpleFoam and simpleSRFFoam
 (setFluxRequired, solutionControls) from vanilla 3.0.1

---
 .../solvers/incompressible/simpleFoam/UEqn.H      |  7 +------
 .../incompressible/simpleFoam/convergenceCheck.H  |  9 ---------
 .../simpleFoam/initConvergenceCheck.H             |  7 -------
 .../solvers/incompressible/simpleFoam/pEqn.H      | 15 +++------------
 .../incompressible/simpleFoam/simpleFoam.C        |  9 ++++-----
 .../incompressible/simpleSRFFoam/createFields.H   |  1 +
 .../incompressible/simpleSRFFoam/simpleSRFFoam.C  | 10 ++++++----
 7 files changed, 15 insertions(+), 43 deletions(-)
 delete mode 100644 applications/solvers/incompressible/simpleFoam/convergenceCheck.H
 delete mode 100644 applications/solvers/incompressible/simpleFoam/initConvergenceCheck.H

diff --git a/applications/solvers/incompressible/simpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/UEqn.H
index 62c9f5536..15a332a3a 100644
--- a/applications/solvers/incompressible/simpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/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/incompressible/simpleFoam/convergenceCheck.H b/applications/solvers/incompressible/simpleFoam/convergenceCheck.H
deleted file mode 100644
index 895806319..000000000
--- a/applications/solvers/incompressible/simpleFoam/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/incompressible/simpleFoam/initConvergenceCheck.H b/applications/solvers/incompressible/simpleFoam/initConvergenceCheck.H
deleted file mode 100644
index b56197f22..000000000
--- a/applications/solvers/incompressible/simpleFoam/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/incompressible/simpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/pEqn.H
index 42ebfc225..22921f652 100644
--- a/applications/solvers/incompressible/simpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/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/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
index 5e80c10f7..5a2c7f87f 100644
--- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
@@ -32,6 +32,7 @@ Description
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "RASModel.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -40,6 +41,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"
 
@@ -51,9 +55,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readSIMPLEControls.H"
-#       include "initConvergenceCheck.H"
-
         p.storePrevIter();
 
         // Pressure-velocity SIMPLE corrector
@@ -69,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/incompressible/simpleSRFFoam/createFields.H b/applications/solvers/incompressible/simpleSRFFoam/createFields.H
index 864b1dd93..d94b46de6 100644
--- a/applications/solvers/incompressible/simpleSRFFoam/createFields.H
+++ b/applications/solvers/incompressible/simpleSRFFoam/createFields.H
@@ -43,6 +43,7 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), 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 528c913b1..bd213c98a 100644
--- a/applications/solvers/incompressible/simpleSRFFoam/simpleSRFFoam.C
+++ b/applications/solvers/incompressible/simpleSRFFoam/simpleSRFFoam.C
@@ -34,6 +34,7 @@ Description
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
 #include "incompressible/RAS/RASModel/RASModel.H"
 #include "SRFModel.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,6 +45,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    simpleControl simple(mesh);
+
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 
@@ -57,8 +61,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readSIMPLEControls.H"
-
         p.storePrevIter();
 
         // Pressure-velocity SIMPLE corrector
@@ -83,7 +85,7 @@ int main(int argc, char *argv[])
             adjustPhi(phi, Urel, p);
 
             // Non-orthogonal pressure corrector loop
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            while (simple.correctNonOrthogonal())
             {
                 fvScalarMatrix pEqn
                 (
@@ -93,7 +95,7 @@ int main(int argc, char *argv[])
                 pEqn.setReference(pRefCell, pRefValue);
                 pEqn.solve();
 
-                if (nonOrth == nNonOrthCorr)
+                if (simple.finalNonOrthogonalIter())
                 {
                     phi -= pEqn.flux();
                 }

From 3f49ab0d2fb61eca250c7f9a6c3fc49015734bd8 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sat, 7 May 2016 09:34:33 +0200
Subject: [PATCH 45/55] Backported potentialFoam and potentialDyMFoam
 (setFluxRequired, solutionControls) from vanilla 3.0.1

---
 .../solvers/basic/potentialDyMFoam/createFields.H        | 1 +
 .../solvers/basic/potentialDyMFoam/potentialDyMFoam.C    | 9 ++++++---
 applications/solvers/basic/potentialFoam/createFields.H  | 1 +
 applications/solvers/basic/potentialFoam/potentialFoam.C | 9 ++++++---
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/applications/solvers/basic/potentialDyMFoam/createFields.H b/applications/solvers/basic/potentialDyMFoam/createFields.H
index d55556bcf..f29c44789 100644
--- a/applications/solvers/basic/potentialDyMFoam/createFields.H
+++ b/applications/solvers/basic/potentialDyMFoam/createFields.H
@@ -48,3 +48,4 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C b/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C
index 0e888d9c2..763ebf180 100644
--- a/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C
+++ b/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C
@@ -34,6 +34,7 @@ Author
 
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,6 +46,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createDynamicFvMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "createFields.H"
 #   include "initTotalVolume.H"
 
@@ -54,7 +58,6 @@ int main(int argc, char *argv[])
 
     while (runTime.loop())
     {
-#       include "readPISOControls.H"
 #       include "checkTotalVolume.H"
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
@@ -75,7 +78,7 @@ int main(int argc, char *argv[])
         // Solve potential flow equations
         adjustPhi(phi, U, p);
 
-        for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+        while (piso.correctNonOrthogonal())
         {
             p.storePrevIter();
 
@@ -98,7 +101,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/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H
index 4806d09ef..108ad4e6d 100644
--- a/applications/solvers/basic/potentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/createFields.H
@@ -50,3 +50,4 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C
index 492e4c499..14b3a6216 100644
--- a/applications/solvers/basic/potentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/potentialFoam.C
@@ -31,6 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,8 +44,10 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    simpleControl simple(mesh);
+
 #   include "createFields.H"
-#   include "readSIMPLEControls.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,7 +55,7 @@ int main(int argc, char *argv[])
 
     adjustPhi(phi, U, p);
 
-    for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+    while (simple.correctNonOrthogonal())
     {
         p.storePrevIter();
 
@@ -75,7 +78,7 @@ int main(int argc, char *argv[])
         pEqn.setReference(pRefCell, pRefValue);
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (simple.finalNonOrthogonalIter())
         {
             phi -= pEqn.flux();
         }

From 685dad16cb771be8d64cbbfc1dce6321b8f7822b Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sat, 7 May 2016 10:04:45 +0200
Subject: [PATCH 46/55] Fixed simpleFoam and simpleSRFFoam tutorials
 (backports)

---
 .../simpleFoam/mixingPlaneAxial/system/fvSchemes         | 8 +-------
 .../simpleFoam/mixingPlaneDomADomB/system/fvSchemes      | 9 +--------
 .../incompressible/simpleFoam/motorBike/system/fvSchemes | 8 +-------
 .../simpleFoam/pitzDaily/constant/polyMesh/boundary      | 2 +-
 .../simpleFoam/pitzDaily3Blocks/system/fvSchemes         | 8 +-------
 .../simpleFoam/pitzDailyExptInlet/system/fvSchemes       | 8 +-------
 .../simpleSRFFoam/axialTurbine/system/fvSchemes          | 8 +-------
 .../incompressible/simpleSRFFoam/mixer/system/fvSchemes  | 8 +-------
 8 files changed, 8 insertions(+), 51 deletions(-)

diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/system/fvSchemes b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/system/fvSchemes
index 3fbe0d858..86545eda5 100644
--- a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -61,12 +61,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 mixingPlane
 {
     default        areaAveraging;
diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/fvSchemes b/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/fvSchemes
index 0b378d702..7db916f58 100644
--- a/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/fvSchemes
@@ -29,7 +29,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss linearUpwind Gauss; //upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
     div(phi,epsilon) Gauss upwind;
     div(phi,k) Gauss upwind;
 }
@@ -59,13 +59,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    pcorr;
-    p;
-}
-
 mixingPlane
 {
     default         areaAveraging;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
index c9329c21e..6600b7ce0 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
     div(phi,U)      Gauss linearUpwindV Gauss linear;
     div(phi,k)      Gauss upwind;
     div(phi,omega)  Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/boundary
index 875a9b2b9..3a93a6794 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/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/simpleFoam/pitzDaily3Blocks/system/fvSchemes b/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/system/fvSchemes
index 3f2ac4e1e..e69ec2c98 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pitzDaily3Blocks/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -60,10 +60,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
index 3f2ac4e1e..e69ec2c98 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -60,10 +60,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleSRFFoam/axialTurbine/system/fvSchemes b/tutorials/incompressible/simpleSRFFoam/axialTurbine/system/fvSchemes
index 3d41bb9dc..fd1a4aea9 100644
--- a/tutorials/incompressible/simpleSRFFoam/axialTurbine/system/fvSchemes
+++ b/tutorials/incompressible/simpleSRFFoam/axialTurbine/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss upwind;
-    div((nuEff*dev(grad(Urel).T()))) Gauss linear;
+    div((nuEff*dev(T(grad(Urel))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -62,10 +62,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes b/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes
index 94be3f5f4..5149899be 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes
@@ -36,7 +36,7 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss upwind;
-    div((nuEff*dev(grad(Urel).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(Urel))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -62,10 +62,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //

From b99c3261a79636dee5aaf2d6f979a29dc8d5c662 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sat, 7 May 2016 10:31:37 +0200
Subject: [PATCH 47/55] Backported interIbFoam, porousSimpleIbFoam and
 simpleIbFoam  (setFluxRequired, solutionControls) to vanilla 3.0.1 format

---
 .../immersedBoundary/interIbFoam/UEqn.H       |  2 +-
 .../immersedBoundary/interIbFoam/correctPhi.H |  4 ++--
 .../interIbFoam/createFields.H                |  2 ++
 .../interIbFoam/interIbFoam.C                 | 13 ++++++------
 .../immersedBoundary/interIbFoam/limitU.H     |  3 ++-
 .../immersedBoundary/interIbFoam/pEqn.H       | 21 ++++++++-----------
 .../porousSimpleIbFoam/UEqn.H                 |  7 +------
 .../porousSimpleIbFoam/convergenceCheck.H     |  9 --------
 .../porousSimpleIbFoam/createFields.H         |  2 +-
 .../porousSimpleIbFoam/initConvergenceCheck.H |  7 -------
 .../porousSimpleIbFoam/pEqn.H                 | 15 +++----------
 .../porousSimpleIbFoam/porousSimpleIbFoam.C   |  9 ++++----
 .../immersedBoundary/simpleIbFoam/UEqn.H      |  7 +------
 .../simpleIbFoam/convergenceCheck.H           |  9 --------
 .../simpleIbFoam/createFields.H               |  2 +-
 .../simpleIbFoam/initConvergenceCheck.H       |  7 -------
 .../immersedBoundary/simpleIbFoam/pEqn.H      | 15 +++----------
 .../simpleIbFoam/simpleIbFoam.C               |  9 ++++----
 18 files changed, 41 insertions(+), 102 deletions(-)
 delete mode 100644 applications/solvers/immersedBoundary/porousSimpleIbFoam/convergenceCheck.H
 delete mode 100644 applications/solvers/immersedBoundary/porousSimpleIbFoam/initConvergenceCheck.H
 delete mode 100644 applications/solvers/immersedBoundary/simpleIbFoam/convergenceCheck.H
 delete mode 100644 applications/solvers/immersedBoundary/simpleIbFoam/initConvergenceCheck.H

diff --git a/applications/solvers/immersedBoundary/interIbFoam/UEqn.H b/applications/solvers/immersedBoundary/interIbFoam/UEqn.H
index 528e0aaaf..0b50eec2c 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/UEqn.H
+++ b/applications/solvers/immersedBoundary/interIbFoam/UEqn.H
@@ -16,7 +16,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve
         (
diff --git a/applications/solvers/immersedBoundary/interIbFoam/correctPhi.H b/applications/solvers/immersedBoundary/interIbFoam/correctPhi.H
index bce66493e..2f5bd5e2f 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/correctPhi.H
+++ b/applications/solvers/immersedBoundary/interIbFoam/correctPhi.H
@@ -38,7 +38,7 @@
 
     mesh.schemesDict().setFluxRequired(pcorr.name());
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while(pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pcorrEqn
         (
@@ -48,7 +48,7 @@
         pcorrEqn.setReference(pdRefCell, pdRefValue);
         pcorrEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi -= pcorrEqn.flux();
         }
diff --git a/applications/solvers/immersedBoundary/interIbFoam/createFields.H b/applications/solvers/immersedBoundary/interIbFoam/createFields.H
index 8012f798c..0fcdf751b 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/createFields.H
+++ b/applications/solvers/immersedBoundary/interIbFoam/createFields.H
@@ -128,6 +128,8 @@
         );
     }
 
+    mesh.schemesDict().setFluxRequired(pd.name());
+
     // Construct interface from alpha1 distribution
     interfaceProperties interface(alpha1, U, twoPhaseProperties);
 
diff --git a/applications/solvers/immersedBoundary/interIbFoam/interIbFoam.C b/applications/solvers/immersedBoundary/interIbFoam/interIbFoam.C
index 5ea2a8744..28db5f069 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/interIbFoam.C
+++ b/applications/solvers/immersedBoundary/interIbFoam/interIbFoam.C
@@ -45,6 +45,7 @@ Author
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
 #include "turbulenceModel.H"
+#include "pimpleControl.H"
 
 #include "immersedBoundaryFvPatch.H"
 #include "immersedBoundaryAdjustPhi.H"
@@ -56,8 +57,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 "createIbMasks.H"
@@ -72,7 +75,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-#       include "readPIMPLEControls.H"
 #       include "readTimeControls.H"
 #       include "immersedBoundaryCourantNo.H"
 #       include "setDeltaT.H"
@@ -82,8 +84,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();
 
@@ -92,7 +93,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"
             }
@@ -117,7 +118,7 @@ int main(int argc, char *argv[])
             }
 
             turbulence->correct();
-        } while (++oCorr < nOuterCorr);
+        }
 
         runTime.write();
 
diff --git a/applications/solvers/immersedBoundary/interIbFoam/limitU.H b/applications/solvers/immersedBoundary/interIbFoam/limitU.H
index 322e59b7c..0c59414f8 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/limitU.H
+++ b/applications/solvers/immersedBoundary/interIbFoam/limitU.H
@@ -1,5 +1,6 @@
 {
-    scalar limitMagU = readScalar(pimple.lookup("limitMagU"));
+    scalar limitMagU =
+        readScalar(mesh.solutionDict().subDict("PIMPLE").lookup("limitMagU"));
 
     volScalarField magU(mag(U));
 
diff --git a/applications/solvers/immersedBoundary/interIbFoam/pEqn.H b/applications/solvers/immersedBoundary/interIbFoam/pEqn.H
index 42fa96e0e..a765455fc 100644
--- a/applications/solvers/immersedBoundary/interIbFoam/pEqn.H
+++ b/applications/solvers/immersedBoundary/interIbFoam/pEqn.H
@@ -1,5 +1,5 @@
 {
-    if (nOuterCorr != 1)
+    if (!pimple.firstIter())
     {
         pd.storePrevIter();
     }
@@ -29,7 +29,7 @@
         )*rUAf*mesh.magSf();
 
 
-    for(int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pdEqn
         (
@@ -38,23 +38,20 @@
 
         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();
         }
     }
 
     // Explicitly relax pressure except for last corrector
-    if (oCorr != nOuterCorr - 1)
+    if (!pimple.finalIter())
     {
         pd.relax();
     }
diff --git a/applications/solvers/immersedBoundary/porousSimpleIbFoam/UEqn.H b/applications/solvers/immersedBoundary/porousSimpleIbFoam/UEqn.H
index fd96d5362..2117cd7e5 100644
--- a/applications/solvers/immersedBoundary/porousSimpleIbFoam/UEqn.H
+++ b/applications/solvers/immersedBoundary/porousSimpleIbFoam/UEqn.H
@@ -9,9 +9,4 @@
 
     pZones.addResistance(UEqn());
 
-    eqnResidual = solve
-    (
-        UEqn() == -fvc::grad(p)
-    ).initialResidual();
-
-    maxResidual = max(eqnResidual, maxResidual);
+    solve(UEqn() == -fvc::grad(p));
diff --git a/applications/solvers/immersedBoundary/porousSimpleIbFoam/convergenceCheck.H b/applications/solvers/immersedBoundary/porousSimpleIbFoam/convergenceCheck.H
deleted file mode 100644
index 895806319..000000000
--- a/applications/solvers/immersedBoundary/porousSimpleIbFoam/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/immersedBoundary/porousSimpleIbFoam/createFields.H b/applications/solvers/immersedBoundary/porousSimpleIbFoam/createFields.H
index 8c7e220e0..6dc7d36c8 100644
--- a/applications/solvers/immersedBoundary/porousSimpleIbFoam/createFields.H
+++ b/applications/solvers/immersedBoundary/porousSimpleIbFoam/createFields.H
@@ -32,7 +32,7 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
-
+    mesh.schemesDict().setFluxRequired(p.name());
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
diff --git a/applications/solvers/immersedBoundary/porousSimpleIbFoam/initConvergenceCheck.H b/applications/solvers/immersedBoundary/porousSimpleIbFoam/initConvergenceCheck.H
deleted file mode 100644
index b56197f22..000000000
--- a/applications/solvers/immersedBoundary/porousSimpleIbFoam/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/immersedBoundary/porousSimpleIbFoam/pEqn.H b/applications/solvers/immersedBoundary/porousSimpleIbFoam/pEqn.H
index b49a24366..dc9f26a38 100644
--- a/applications/solvers/immersedBoundary/porousSimpleIbFoam/pEqn.H
+++ b/applications/solvers/immersedBoundary/porousSimpleIbFoam/pEqn.H
@@ -14,7 +14,7 @@
     adjustPhi(phi, U, p);
 
     // Non-orthogonal pressure corrector loop
-    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())
         {
             phi -= pEqn.flux();
         }
diff --git a/applications/solvers/immersedBoundary/porousSimpleIbFoam/porousSimpleIbFoam.C b/applications/solvers/immersedBoundary/porousSimpleIbFoam/porousSimpleIbFoam.C
index 289922e9f..6c873025b 100644
--- a/applications/solvers/immersedBoundary/porousSimpleIbFoam/porousSimpleIbFoam.C
+++ b/applications/solvers/immersedBoundary/porousSimpleIbFoam/porousSimpleIbFoam.C
@@ -37,6 +37,7 @@ Author
 #include "singlePhaseTransportModel.H"
 #include "RASModel.H"
 #include "porousZones.H"
+#include "simpleControl.H"
 
 #include "immersedBoundaryFvPatch.H"
 #include "immersedBoundaryAdjustPhi.H"
@@ -48,6 +49,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    simpleControl simple(mesh);
+
 #   include "createIbMasks.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
@@ -60,9 +64,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readSIMPLEControls.H"
-#       include "initConvergenceCheck.H"
-
         p.storePrevIter();
 
         // Pressure-velocity SIMPLE corrector
@@ -78,8 +79,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/immersedBoundary/simpleIbFoam/UEqn.H b/applications/solvers/immersedBoundary/simpleIbFoam/UEqn.H
index e41c4422a..5e1c5816b 100644
--- a/applications/solvers/immersedBoundary/simpleIbFoam/UEqn.H
+++ b/applications/solvers/immersedBoundary/simpleIbFoam/UEqn.H
@@ -7,9 +7,4 @@
 
     UEqn().relax();
 
-    eqnResidual = solve
-    (
-        UEqn() == -fvc::grad(p)
-    ).initialResidual();
-
-    maxResidual = max(eqnResidual, maxResidual);
+    solve(UEqn() == -fvc::grad(p));
diff --git a/applications/solvers/immersedBoundary/simpleIbFoam/convergenceCheck.H b/applications/solvers/immersedBoundary/simpleIbFoam/convergenceCheck.H
deleted file mode 100644
index 895806319..000000000
--- a/applications/solvers/immersedBoundary/simpleIbFoam/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/immersedBoundary/simpleIbFoam/createFields.H b/applications/solvers/immersedBoundary/simpleIbFoam/createFields.H
index b957c7265..7527c084a 100644
--- a/applications/solvers/immersedBoundary/simpleIbFoam/createFields.H
+++ b/applications/solvers/immersedBoundary/simpleIbFoam/createFields.H
@@ -32,7 +32,7 @@
     label pRefCell = 0;
     scalar pRefValue = 0.0;
     setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
-
+    mesh.schemesDict().setFluxRequired(p.name());
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
diff --git a/applications/solvers/immersedBoundary/simpleIbFoam/initConvergenceCheck.H b/applications/solvers/immersedBoundary/simpleIbFoam/initConvergenceCheck.H
deleted file mode 100644
index b56197f22..000000000
--- a/applications/solvers/immersedBoundary/simpleIbFoam/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/immersedBoundary/simpleIbFoam/pEqn.H b/applications/solvers/immersedBoundary/simpleIbFoam/pEqn.H
index 6a54f2e8d..dc9f26a38 100644
--- a/applications/solvers/immersedBoundary/simpleIbFoam/pEqn.H
+++ b/applications/solvers/immersedBoundary/simpleIbFoam/pEqn.H
@@ -14,7 +14,7 @@
     adjustPhi(phi, U, p);
 
     // Non-orthogonal pressure corrector loop
-    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())
         {
             phi -= pEqn.flux();
         }
diff --git a/applications/solvers/immersedBoundary/simpleIbFoam/simpleIbFoam.C b/applications/solvers/immersedBoundary/simpleIbFoam/simpleIbFoam.C
index 2b6bcbcd1..69c09be88 100644
--- a/applications/solvers/immersedBoundary/simpleIbFoam/simpleIbFoam.C
+++ b/applications/solvers/immersedBoundary/simpleIbFoam/simpleIbFoam.C
@@ -36,6 +36,7 @@ Author
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
 #include "RASModel.H"
+#include "simpleControl.H"
 
 #include "immersedBoundaryFvPatch.H"
 #include "immersedBoundaryAdjustPhi.H"
@@ -47,6 +48,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    simpleControl simple(mesh);
+
 #   include "createIbMasks.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
@@ -59,9 +63,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readSIMPLEControls.H"
-#       include "initConvergenceCheck.H"
-
         p.storePrevIter();
 
         // Pressure-velocity SIMPLE corrector
@@ -77,8 +78,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;

From f698306f06051936f85f9f5d6e15ff40f0482ec5 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sat, 7 May 2016 10:54:54 +0200
Subject: [PATCH 48/55] Fixed the rest of IB tutorials (backports)

---
 .../system/fvSchemes                                      | 7 +------
 .../immersedBoundary/cylBumpInterIbFoam/system/fvSchemes  | 6 ------
 .../cylinderInChannelPotential/system/fvSchemes           | 5 -----
 .../cylinderInChannelScalarTransport/system/fvSchemes     | 6 ------
 .../cylinderInSquareLaplace/system/fvSchemes              | 3 ---
 .../cylinderInSquarePotential/system/fvSchemes            | 5 -----
 .../immersedBoundary/pitzDailyBodyFitted/system/fvSchemes | 8 +-------
 .../pitzDailyLaminarSimpleIbFoam/system/fvSchemes         | 7 +------
 .../pitzDailyTurbulentSimpleIbFoam/system/fvSchemes       | 7 +------
 .../porousBumpChannelBodyFitted/system/fvSchemes          | 8 +-------
 .../immersedBoundary/porousBumpChannelIb/system/fvSchemes | 7 +------
 11 files changed, 6 insertions(+), 63 deletions(-)

diff --git a/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/fvSchemes b/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/fvSchemes
index df1cb966e..ec97900e6 100644
--- a/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/fvSchemes
+++ b/tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
     div(phi,k)          Gauss upwind;
     div(phi,epsilon)    Gauss upwind;
 
-    div((nuEff*dev(grad(U).T())))  Gauss linear;
+    div((nuEff*dev2(T(grad(U)))))  Gauss linear;
 }
 
 laplacianSchemes
@@ -57,9 +57,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/cylBumpInterIbFoam/system/fvSchemes b/tutorials/immersedBoundary/cylBumpInterIbFoam/system/fvSchemes
index 5fdfdf752..b852f3bf1 100644
--- a/tutorials/immersedBoundary/cylBumpInterIbFoam/system/fvSchemes
+++ b/tutorials/immersedBoundary/cylBumpInterIbFoam/system/fvSchemes
@@ -50,10 +50,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    pd;
-    pcorr;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/cylinderInChannelPotential/system/fvSchemes b/tutorials/immersedBoundary/cylinderInChannelPotential/system/fvSchemes
index 974b06b9a..0d8f54d38 100644
--- a/tutorials/immersedBoundary/cylinderInChannelPotential/system/fvSchemes
+++ b/tutorials/immersedBoundary/cylinderInChannelPotential/system/fvSchemes
@@ -51,9 +51,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/cylinderInChannelScalarTransport/system/fvSchemes b/tutorials/immersedBoundary/cylinderInChannelScalarTransport/system/fvSchemes
index a44daa938..106f4e939 100644
--- a/tutorials/immersedBoundary/cylinderInChannelScalarTransport/system/fvSchemes
+++ b/tutorials/immersedBoundary/cylinderInChannelScalarTransport/system/fvSchemes
@@ -49,10 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/cylinderInSquareLaplace/system/fvSchemes b/tutorials/immersedBoundary/cylinderInSquareLaplace/system/fvSchemes
index 9919c4816..ed8eea573 100644
--- a/tutorials/immersedBoundary/cylinderInSquareLaplace/system/fvSchemes
+++ b/tutorials/immersedBoundary/cylinderInSquareLaplace/system/fvSchemes
@@ -44,7 +44,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/cylinderInSquarePotential/system/fvSchemes b/tutorials/immersedBoundary/cylinderInSquarePotential/system/fvSchemes
index 9ffdbebb2..a6daae088 100644
--- a/tutorials/immersedBoundary/cylinderInSquarePotential/system/fvSchemes
+++ b/tutorials/immersedBoundary/cylinderInSquarePotential/system/fvSchemes
@@ -52,9 +52,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/pitzDailyBodyFitted/system/fvSchemes b/tutorials/immersedBoundary/pitzDailyBodyFitted/system/fvSchemes
index c3fc1ddde..a9b5918d5 100644
--- a/tutorials/immersedBoundary/pitzDailyBodyFitted/system/fvSchemes
+++ b/tutorials/immersedBoundary/pitzDailyBodyFitted/system/fvSchemes
@@ -35,7 +35,7 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -61,10 +61,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/pitzDailyLaminarSimpleIbFoam/system/fvSchemes b/tutorials/immersedBoundary/pitzDailyLaminarSimpleIbFoam/system/fvSchemes
index 5155481da..4a9d0cbdd 100644
--- a/tutorials/immersedBoundary/pitzDailyLaminarSimpleIbFoam/system/fvSchemes
+++ b/tutorials/immersedBoundary/pitzDailyLaminarSimpleIbFoam/system/fvSchemes
@@ -29,7 +29,7 @@ divSchemes
     default         none;
     div(phi,U)      Gauss vanLeerDC;
 
-    div((nuEff*dev(grad(U).T())))  Gauss linear;
+    div((nuEff*dev2(T(grad(U)))))  Gauss linear;
 }
 
 laplacianSchemes
@@ -52,9 +52,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/fvSchemes b/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/fvSchemes
index df1cb966e..ec97900e6 100644
--- a/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/fvSchemes
+++ b/tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
     div(phi,k)          Gauss upwind;
     div(phi,epsilon)    Gauss upwind;
 
-    div((nuEff*dev(grad(U).T())))  Gauss linear;
+    div((nuEff*dev2(T(grad(U)))))  Gauss linear;
 }
 
 laplacianSchemes
@@ -57,9 +57,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/porousBumpChannelBodyFitted/system/fvSchemes b/tutorials/immersedBoundary/porousBumpChannelBodyFitted/system/fvSchemes
index bb3fe4f18..6ec0683cc 100644
--- a/tutorials/immersedBoundary/porousBumpChannelBodyFitted/system/fvSchemes
+++ b/tutorials/immersedBoundary/porousBumpChannelBodyFitted/system/fvSchemes
@@ -30,7 +30,7 @@ gradSchemes
 divSchemes
 {
     div(phi,U)      Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
+    div((nuEff*dev2(T(grad(U))))) Gauss linear;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
 }
@@ -54,10 +54,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/immersedBoundary/porousBumpChannelIb/system/fvSchemes b/tutorials/immersedBoundary/porousBumpChannelIb/system/fvSchemes
index df1cb966e..ec97900e6 100644
--- a/tutorials/immersedBoundary/porousBumpChannelIb/system/fvSchemes
+++ b/tutorials/immersedBoundary/porousBumpChannelIb/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
     div(phi,k)          Gauss upwind;
     div(phi,epsilon)    Gauss upwind;
 
-    div((nuEff*dev(grad(U).T())))  Gauss linear;
+    div((nuEff*dev2(T(grad(U)))))  Gauss linear;
 }
 
 laplacianSchemes
@@ -57,9 +57,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //

From 30644bf3b0a1479c352fd0ffa1b79f56e94763a8 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sun, 8 May 2016 09:17:22 +0200
Subject: [PATCH 49/55] Backported laplacianFoam and tutorials (vanilla OF
 3.0.1)

---
 applications/solvers/basic/laplacianFoam/laplacianFoam.C | 9 +++++----
 .../Case1.1_mixingPlane_sector_AB_60deg/system/fvSchemes | 7 -------
 .../laplacianFoam/flange/constant/polyMesh/boundary      | 2 +-
 tutorials/basic/laplacianFoam/flange/system/fvSchemes    | 6 ------
 .../laplacianFoam/twoBlocksMixingPlane/system/fvSchemes  | 6 ------
 .../twoBlocksMixingPlaneMismatch/system/fvSchemes        | 6 ------
 6 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/applications/solvers/basic/laplacianFoam/laplacianFoam.C b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
index 08c398152..d025f6bb4 100644
--- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C
+++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
@@ -30,7 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -41,6 +41,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    simpleControl simple(mesh);
+
 #   include "createFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,9 +54,7 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readSIMPLEControls.H"
-
-        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+        while (simple.correctNonOrthogonal())
         {
             solve
             (
diff --git a/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/system/fvSchemes b/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/system/fvSchemes
index 3768f090e..150202974 100644
--- a/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/system/fvSchemes
+++ b/tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/system/fvSchemes
@@ -35,7 +35,6 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phi,nuTilda) Gauss upwind;
-    div((nuEff*dev(grad(U).T()))) Gauss linear;
 }
 
 laplacianSchemes
@@ -62,12 +61,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 mixingPlane
 {
     default         areaAveraging;
diff --git a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary
index 78afd7dcf..3928133c7 100644
--- a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary
+++ b/tutorials/basic/laplacianFoam/flange/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/basic/laplacianFoam/flange/system/fvSchemes b/tutorials/basic/laplacianFoam/flange/system/fvSchemes
index f209524d4..3c4e61eae 100644
--- a/tutorials/basic/laplacianFoam/flange/system/fvSchemes
+++ b/tutorials/basic/laplacianFoam/flange/system/fvSchemes
@@ -47,10 +47,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    T               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/system/fvSchemes b/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/system/fvSchemes
index 25da1966b..038e70296 100644
--- a/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/system/fvSchemes
+++ b/tutorials/basic/laplacianFoam/twoBlocksMixingPlane/system/fvSchemes
@@ -46,12 +46,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    T;
-}
-
 mixingPlane
 {
     default        zeroGradient;
diff --git a/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/system/fvSchemes b/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/system/fvSchemes
index b8890eb27..8c1ada5e5 100644
--- a/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/system/fvSchemes
+++ b/tutorials/basic/laplacianFoam/twoBlocksMixingPlaneMismatch/system/fvSchemes
@@ -46,12 +46,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    T;
-}
-
 mixingPlane
 {
     default         zeroGradient;

From 4ea9d1f3b8877aa3695ac0b90bbfbfd4e54992d3 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sun, 8 May 2016 09:29:03 +0200
Subject: [PATCH 50/55] Fixed PODSolver and potentialFoam tutorials (backports)

---
 .../1DPODdiffusion/constant/polyMesh/boundary |  5 +--
 .../PODSolver/1DPODdiffusion/system/fvSchemes |  6 ---
 .../1DPODdiffusion/system/fvSolution          |  7 ++-
 .../1DPODsin/constant/polyMesh/boundary       | 44 +++++++++----------
 .../basic/PODSolver/1DPODsin/system/fvSchemes |  6 ---
 .../PODSolver/1DPODsin/system/fvSolution      |  7 ++-
 .../potentialFoam/cylinder/system/fvSchemes   |  6 ---
 .../pitzDaily/constant/polyMesh/boundary      |  4 +-
 .../potentialFoam/pitzDaily/system/fvSchemes  |  6 ---
 9 files changed, 35 insertions(+), 56 deletions(-)

diff --git a/tutorials/basic/PODSolver/1DPODdiffusion/constant/polyMesh/boundary b/tutorials/basic/PODSolver/1DPODdiffusion/constant/polyMesh/boundary
index c709b5973..b3515939c 100644
--- a/tutorials/basic/PODSolver/1DPODdiffusion/constant/polyMesh/boundary
+++ b/tutorials/basic/PODSolver/1DPODdiffusion/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
 {
@@ -32,7 +32,6 @@ FoamFile
     frontAndBack
     {
         type            empty;
-        physicalType    empty;
         nFaces          200;
         startFace       51;
     }
diff --git a/tutorials/basic/PODSolver/1DPODdiffusion/system/fvSchemes b/tutorials/basic/PODSolver/1DPODdiffusion/system/fvSchemes
index 0d8af6ba4..1ee97262f 100644
--- a/tutorials/basic/PODSolver/1DPODdiffusion/system/fvSchemes
+++ b/tutorials/basic/PODSolver/1DPODdiffusion/system/fvSchemes
@@ -47,10 +47,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    T;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/basic/PODSolver/1DPODdiffusion/system/fvSolution b/tutorials/basic/PODSolver/1DPODdiffusion/system/fvSolution
index 77168fe4f..913200f86 100644
--- a/tutorials/basic/PODSolver/1DPODdiffusion/system/fvSolution
+++ b/tutorials/basic/PODSolver/1DPODdiffusion/system/fvSolution
@@ -14,9 +14,12 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-solvers
+T
 {
-    T           BICCG 1e-06 0;
+    solver          PBiCG;
+    preconditioner  DILU;
+    tolerance       1e-06;
+    relTol          0;
 }
 
 SIMPLE
diff --git a/tutorials/basic/PODSolver/1DPODsin/constant/polyMesh/boundary b/tutorials/basic/PODSolver/1DPODsin/constant/polyMesh/boundary
index 8f5836eb6..b3515939c 100644
--- a/tutorials/basic/PODSolver/1DPODsin/constant/polyMesh/boundary
+++ b/tutorials/basic/PODSolver/1DPODsin/constant/polyMesh/boundary
@@ -1,42 +1,40 @@
 /*--------------------------------*- 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       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 3
 (
-left
-{
-    type patch;
-    nFaces 1;
-    startFace 49;
-}
-
-right
-{
-    type patch;
-    nFaces 1;
-    startFace 50;
-}
-
-frontAndBack
-{
-    type empty;
-    physicalType empty;
-    nFaces 200;
-    startFace 51;
-}
+    left
+    {
+        type            patch;
+        nFaces          1;
+        startFace       49;
+    }
+    right
+    {
+        type            patch;
+        nFaces          1;
+        startFace       50;
+    }
+    frontAndBack
+    {
+        type            empty;
+        nFaces          200;
+        startFace       51;
+    }
 )
 
 // ************************************************************************* //
diff --git a/tutorials/basic/PODSolver/1DPODsin/system/fvSchemes b/tutorials/basic/PODSolver/1DPODsin/system/fvSchemes
index 81704eac9..773e9c474 100644
--- a/tutorials/basic/PODSolver/1DPODsin/system/fvSchemes
+++ b/tutorials/basic/PODSolver/1DPODsin/system/fvSchemes
@@ -46,10 +46,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    T;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/basic/PODSolver/1DPODsin/system/fvSolution b/tutorials/basic/PODSolver/1DPODsin/system/fvSolution
index 77168fe4f..913200f86 100644
--- a/tutorials/basic/PODSolver/1DPODsin/system/fvSolution
+++ b/tutorials/basic/PODSolver/1DPODsin/system/fvSolution
@@ -14,9 +14,12 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-solvers
+T
 {
-    T           BICCG 1e-06 0;
+    solver          PBiCG;
+    preconditioner  DILU;
+    tolerance       1e-06;
+    relTol          0;
 }
 
 SIMPLE
diff --git a/tutorials/basic/potentialFoam/cylinder/system/fvSchemes b/tutorials/basic/potentialFoam/cylinder/system/fvSchemes
index 5bc63f611..7ad1a2442 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/fvSchemes
+++ b/tutorials/basic/potentialFoam/cylinder/system/fvSchemes
@@ -46,10 +46,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary
index 061b795fa..3a93a6794 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/basic/potentialFoam/pitzDaily/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/basic/potentialFoam/pitzDaily/system/fvSchemes b/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes
index 5bc63f611..7ad1a2442 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes
@@ -46,10 +46,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //

From 37964b360c88be51cf678ea3b9f57dd4b82f0a52 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sun, 8 May 2016 09:38:57 +0200
Subject: [PATCH 51/55] Backported scalarTransportFoam and tutorials (vanilla
 OF 3.0.1)

---
 .../basic/scalarTransportFoam/scalarTransportFoam.C       | 8 +++++---
 .../pitzDaily/constant/polyMesh/boundary                  | 4 ++--
 .../basic/scalarTransportFoam/pitzDaily/system/fvSchemes  | 6 ------
 .../swirlTest/constant/polyMesh/boundary                  | 4 ++--
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
index d9a45843b..3a72a378a 100644
--- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
+++ b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
@@ -30,6 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
+#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,6 +40,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    simpleControl simple(mesh);
+
 #   include "createFields.H"
 
 
@@ -52,9 +56,7 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readSIMPLEControls.H"
-
-        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+        while (simple.correctNonOrthogonal())
         {
             solve
             (
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary
index 061b795fa..3a93a6794 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/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/basic/scalarTransportFoam/pitzDaily/system/fvSchemes b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes
index 17c5e5c09..15e900fc8 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes
@@ -47,10 +47,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    T               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/basic/scalarTransportFoam/swirlTest/constant/polyMesh/boundary b/tutorials/basic/scalarTransportFoam/swirlTest/constant/polyMesh/boundary
index cf8b0f726..8c24ffa42 100644
--- a/tutorials/basic/scalarTransportFoam/swirlTest/constant/polyMesh/boundary
+++ b/tutorials/basic/scalarTransportFoam/swirlTest/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
 {

From 53dcbea597f4097e13461f34e19bc7c2d7ee7bb0 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sun, 8 May 2016 10:48:57 +0200
Subject: [PATCH 52/55] Backported XiFoam, engineFoam, coldEngineFoam and
 tutorials (vanilla OF 3.0.1)

---
 applications/solvers/combustion/XiFoam/UEqn.H          |  2 +-
 applications/solvers/combustion/XiFoam/XiFoam.C        |  9 ++++++---
 applications/solvers/combustion/XiFoam/createFields.H  |  2 ++
 applications/solvers/combustion/XiFoam/pEqn.H          | 10 +++++-----
 .../solvers/combustion/coldEngineFoam/coldEngineFoam.C |  7 +++++--
 .../solvers/combustion/coldEngineFoam/createFields.H   |  2 ++
 applications/solvers/combustion/engineFoam/UEqn.H      |  2 +-
 .../solvers/combustion/engineFoam/engineFoam.C         |  7 +++++--
 applications/solvers/combustion/engineFoam/pEqn.H      | 10 +++++-----
 .../combustion/XiFoam/les/pitzDaily/system/fvSchemes   |  8 +-------
 .../combustion/XiFoam/les/pitzDaily/system/fvSolution  |  2 +-
 .../combustion/XiFoam/les/pitzDaily3D/system/fvSchemes |  8 +-------
 .../XiFoam/les/pitzDaily3D/system/fvSolution           |  2 +-
 .../XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes   |  8 +-------
 .../XiFoam/ras/moriyoshiHomogeneous/system/fvSolution  |  2 +-
 .../engineFoam/kivaTest/constant/polyMesh/boundary     |  4 ++--
 .../combustion/engineFoam/kivaTest/system/fvSchemes    |  9 ++-------
 17 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/applications/solvers/combustion/XiFoam/UEqn.H b/applications/solvers/combustion/XiFoam/UEqn.H
index 9697c6e1e..1e626d75b 100644
--- a/applications/solvers/combustion/XiFoam/UEqn.H
+++ b/applications/solvers/combustion/XiFoam/UEqn.H
@@ -9,7 +9,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
     }
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index c652e2624..f4b93a51f 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -55,6 +55,7 @@ Description
 #include "laminarFlameSpeed.H"
 #include "ignition.H"
 #include "Switch.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -64,6 +65,9 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "readCombustionProperties.H"
 #   include "readGravitationalAcceleration.H"
 #   include "createFields.H"
@@ -79,7 +83,6 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
 #       include "readTimeControls.H"
-#       include "readPISOControls.H"
 #       include "compressibleCourantNo.H"
 #       include "setDeltaT.H"
 
@@ -87,7 +90,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())
         {
 #           include "rhoEqn.H"
 #           include "UEqn.H"
@@ -103,7 +106,7 @@ int main(int argc, char *argv[])
             }
 
             // --- PISO loop
-            for (int corr=1; corr<=nCorr; corr++)
+            while (pimple.correct())
             {
 #              include "pEqn.H"
             }
diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H
index a40c9e9ef..a92694355 100644
--- a/applications/solvers/combustion/XiFoam/createFields.H
+++ b/applications/solvers/combustion/XiFoam/createFields.H
@@ -132,3 +132,5 @@
     fields.add(b);
     fields.add(h);
     fields.add(hu);
+
+    mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/combustion/XiFoam/pEqn.H b/applications/solvers/combustion/XiFoam/pEqn.H
index 280842ecc..970a11b8f 100644
--- a/applications/solvers/combustion/XiFoam/pEqn.H
+++ b/applications/solvers/combustion/XiFoam/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
         (
@@ -26,7 +26,7 @@ if (transonic)
 
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi == pEqn.flux();
         }
@@ -41,7 +41,7 @@ else
           + fvc::ddtPhiCorr(rUA, rho, U, phi)
         );
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -52,7 +52,7 @@ else
 
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi += pEqn.flux();
         }
diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
index 747b035f1..1ee53dde6 100644
--- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
+++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
@@ -35,6 +35,7 @@ Description
 #include "basicPsiThermo.H"
 #include "turbulenceModel.H"
 #include "OFstream.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,6 +45,9 @@ int main(int argc, char *argv[])
 
 #   include "createEngineTime.H"
 #   include "createEngineMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 #   include "createTimeControls.H"
@@ -58,7 +62,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-#       include "readPISOControls.H"
 #       include "readEngineTimeControls.H"
 #       include "compressibleCourantNo.H"
 #       include "setDeltaT.H"
@@ -75,7 +78,7 @@ int main(int argc, char *argv[])
 #       include "UEqn.H"
 
         // --- PISO loop
-        for (int corr=1; corr<=nCorr; corr++)
+        while (piso.correct())
         {
 #           include "hEqn.H"
 #           include "pEqn.H"
diff --git a/applications/solvers/combustion/coldEngineFoam/createFields.H b/applications/solvers/combustion/coldEngineFoam/createFields.H
index 7b1c086df..28f1f7d64 100644
--- a/applications/solvers/combustion/coldEngineFoam/createFields.H
+++ b/applications/solvers/combustion/coldEngineFoam/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/applications/solvers/combustion/engineFoam/UEqn.H b/applications/solvers/combustion/engineFoam/UEqn.H
index 64dd52b1b..3016e1b9a 100644
--- a/applications/solvers/combustion/engineFoam/UEqn.H
+++ b/applications/solvers/combustion/engineFoam/UEqn.H
@@ -5,7 +5,7 @@
       + turbulence->divDevRhoReff(U)
     );
 
-    if (momentumPredictor)
+    if (piso.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
     }
diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C
index 56b487bf8..0b55614b1 100644
--- a/applications/solvers/combustion/engineFoam/engineFoam.C
+++ b/applications/solvers/combustion/engineFoam/engineFoam.C
@@ -57,6 +57,7 @@ Description
 #include "ignition.H"
 #include "Switch.H"
 #include "OFstream.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -66,6 +67,9 @@ int main(int argc, char *argv[])
 
 #   include "createEngineTime.H"
 #   include "createEngineMesh.H"
+
+    pisoControl piso(mesh);
+
 #   include "readCombustionProperties.H"
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
@@ -81,7 +85,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-#       include "readPISOControls.H"
 #       include "readEngineTimeControls.H"
 #       include "compressibleCourantNo.H"
 #       include "setDeltaT.H"
@@ -97,7 +100,7 @@ int main(int argc, char *argv[])
 #       include "UEqn.H"
 
         // --- PISO loop
-        for (int corr=1; corr<=nCorr; corr++)
+        while (piso.correct()) 
         {
 #           include "ftEqn.H"
 #           include "bEqn.H"
diff --git a/applications/solvers/combustion/engineFoam/pEqn.H b/applications/solvers/combustion/engineFoam/pEqn.H
index 39b496731..ed86b9c97 100644
--- a/applications/solvers/combustion/engineFoam/pEqn.H
+++ b/applications/solvers/combustion/engineFoam/pEqn.H
@@ -3,7 +3,7 @@ rho = thermo.rho();
 volScalarField rUA = 1.0/UEqn.A();
 U = rUA*UEqn.H();
 
-if (transonic)
+if (piso.transonic())
 {
     surfaceScalarField phid
     (
@@ -12,7 +12,7 @@ if (transonic)
        *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U))
     );
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (piso.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -23,7 +23,7 @@ if (transonic)
 
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (piso.finalNonOrthogonalIter())
         {
             phi == pEqn.flux();
         }
@@ -34,7 +34,7 @@ else
     phi = fvc::interpolate(rho)
          *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U));
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (piso.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -45,7 +45,7 @@ else
 
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (piso.finalNonOrthogonalIter())
         {
             phi += pEqn.flux();
         }
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
index 617e2c137..85149d415 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
@@ -44,7 +44,7 @@ divSchemes
     div(U)          Gauss linear;
     div((Su*grad(b))) Gauss linear;
     div((U+((Su*Xi)*grad(b)))) Gauss linear;
-    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div((muEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -70,10 +70,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
index 14c6270cb..bb58ac024 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
@@ -122,7 +122,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors 2;
     nCorrectors     1;
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes
index 9e60a7502..923b1c8b5 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes
@@ -44,7 +44,7 @@ divSchemes
     div(U)          Gauss linear;
     div((Su*grad(b))) Gauss linear;
     div((U+((Su*Xi)*grad(b)))) Gauss linear;
-    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div((muEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -70,10 +70,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
index aa029ac96..f6268e03c 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
@@ -122,7 +122,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors 2;
     nCorrectors     1;
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes
index fa004306d..96e263d29 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes
@@ -50,7 +50,7 @@ divSchemes
     div(U)          Gauss linear;
     div((Su*grad(b))) Gauss linear;
     div((U+((Su*Xi)*grad(b)))) Gauss linear;
-    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div((muEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -77,10 +77,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution
index 7c6380a8e..ad27ea05d 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution
@@ -122,7 +122,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary
index fd71ea09e..a50d04c25 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary
+++ b/tutorials/combustion/engineFoam/kivaTest/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/combustion/engineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
index 6e689868b..15ad9d5f3 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
+++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
@@ -43,7 +43,7 @@ divSchemes
     div(U)          Gauss linear;
     div((Su*grad(b))) Gauss linear;
     div((U+((Su*Xi)*grad(b)))) Gauss linear;
-    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div((muEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -59,6 +59,7 @@ laplacianSchemes
     laplacian(alphaEff,h) Gauss linear limited 0.5;
     laplacian(alphaEff,hu) Gauss linear limited 0.5;
     laplacian(alphaEff,ft) Gauss linear limited 0.5;
+    laplacian(alphaEff,b) Gauss linear limited 0.5;
 }
 
 interpolationSchemes
@@ -71,10 +72,4 @@ snGradSchemes
     default         limited 0.5;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //

From f609442e998d5da125fda0648630d922ed28ee59 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sun, 8 May 2016 11:28:13 +0200
Subject: [PATCH 53/55] Backported dieselFoam, dieselEngineFoam, fireFoam,
 reactingFoam and tutorials (vanilla OF 3.0.1)

---
 .../combustion/dieselEngineFoam/UEqn.H        |  2 +-
 .../dieselEngineFoam/createFields.H           |  2 ++
 .../dieselEngineFoam/dieselEngineFoam.C       |  9 +++--
 .../combustion/dieselEngineFoam/pEqn.H        | 10 +++---
 .../combustion/dieselFoam/dieselFoam.C        |  9 +++--
 .../solvers/combustion/dieselFoam/pEqn.H      | 10 +++---
 .../solvers/combustion/fireFoam/UEqn.H        | 36 ++++++-------------
 .../combustion/fireFoam/createFields.H        |  2 ++
 .../solvers/combustion/fireFoam/fireFoam.C    |  9 +++--
 .../solvers/combustion/fireFoam/pEqn.H        | 16 ++++-----
 .../solvers/combustion/reactingFoam/UEqn.H    |  2 +-
 .../combustion/reactingFoam/createFields.H    |  2 ++
 .../solvers/combustion/reactingFoam/pEqn.H    | 10 +++---
 .../combustion/reactingFoam/reactingFoam.C    |  9 +++--
 .../combustion/dieselFoam/aachenBomb/0/ft     |  2 +-
 .../combustion/dieselFoam/aachenBomb/0/fu     |  2 +-
 .../dieselFoam/aachenBomb/system/fvSchemes    |  8 +----
 .../dieselFoam/aachenBomb/system/fvSolution   |  2 +-
 .../fireFoam/les/smallPoolFire2D/0/G          | 27 +++++++++++++-
 .../fireFoam/les/smallPoolFire2D/0/IDefault   | 27 +++++++++++++-
 .../fireFoam/les/smallPoolFire2D/0/T          |  2 +-
 .../fireFoam/les/smallPoolFire2D/0/U          |  2 +-
 .../fireFoam/les/smallPoolFire2D/0/alphaSgs   |  2 +-
 .../fireFoam/les/smallPoolFire2D/0/b          |  2 +-
 .../fireFoam/les/smallPoolFire2D/0/ft         |  2 +-
 .../fireFoam/les/smallPoolFire2D/0/fu         |  2 +-
 .../fireFoam/les/smallPoolFire2D/0/k          |  2 +-
 .../fireFoam/les/smallPoolFire2D/0/muSgs      |  2 +-
 .../fireFoam/les/smallPoolFire2D/0/p          |  2 +-
 .../les/smallPoolFire2D/system/fvSchemes      |  8 +----
 .../les/smallPoolFire2D/system/fvSolution     |  2 +-
 .../ras/counterFlowFlame2D/Allrun             |  0
 .../ras/counterFlowFlame2D/system/fvSchemes   |  8 +----
 .../ras/counterFlowFlame2D/system/fvSolution  |  2 +-
 34 files changed, 132 insertions(+), 102 deletions(-)
 mode change 100644 => 100755 tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/Allrun

diff --git a/applications/solvers/combustion/dieselEngineFoam/UEqn.H b/applications/solvers/combustion/dieselEngineFoam/UEqn.H
index 64c190ec9..30575b772 100644
--- a/applications/solvers/combustion/dieselEngineFoam/UEqn.H
+++ b/applications/solvers/combustion/dieselEngineFoam/UEqn.H
@@ -10,7 +10,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
     }
diff --git a/applications/solvers/combustion/dieselEngineFoam/createFields.H b/applications/solvers/combustion/dieselEngineFoam/createFields.H
index 37aeca4c0..c198d5945 100644
--- a/applications/solvers/combustion/dieselEngineFoam/createFields.H
+++ b/applications/solvers/combustion/dieselEngineFoam/createFields.H
@@ -107,3 +107,5 @@ DimensionedField<scalar, volMesh> chemistrySh
     mesh,
     dimensionedScalar("chemistrySh", dimEnergy/dimTime/dimVolume, 0.0)
 );
+
+mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index 0389733d0..91eb66fce 100644
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@@ -42,6 +42,7 @@ Description
 #include "OFstream.H"
 #include "volPointInterpolation.H"
 #include "thermoPhysicsTypes.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,6 +51,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createEngineTime.H"
 #   include "createEngineMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "createFields.H"
 #   include "readGravitationalAcceleration.H"
 #   include "readCombustionProperties.H"
@@ -67,7 +71,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-#       include "readPISOControls.H"
 #       include "readEngineTimeControls.H"
 #       include "compressibleCourantNo.H"
 #       include "setDeltaT.H"
@@ -103,13 +106,13 @@ int main(int argc, char *argv[])
 #       include "rhoEqn.H"
 #       include "UEqn.H"
 
-        for (label ocorr=1; ocorr <= nOuterCorr; ocorr++)
+        while (pimple.loop())
         {
 #           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/combustion/dieselEngineFoam/pEqn.H b/applications/solvers/combustion/dieselEngineFoam/pEqn.H
index b68ae7329..3ab6d5913 100644
--- a/applications/solvers/combustion/dieselEngineFoam/pEqn.H
+++ b/applications/solvers/combustion/dieselEngineFoam/pEqn.H
@@ -3,7 +3,7 @@ rho = thermo.rho();
 volScalarField A = UEqn.A();
 U = UEqn.H()/A;
 
-if (transonic)
+if (pimple.transonic())
 {
     surfaceScalarField phid
     (
@@ -12,7 +12,7 @@ if (transonic)
        *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U))
     );
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -25,7 +25,7 @@ if (transonic)
 
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi == pEqn.flux();
         }
@@ -36,7 +36,7 @@ else
     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
         (
@@ -49,7 +49,7 @@ else
 
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi += pEqn.flux();
         }
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index f29fe4d45..793375f4f 100644
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@@ -40,6 +40,7 @@ Description
 #include "IFstream.H"
 #include "OFstream.H"
 #include "Switch.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,6 +49,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "createFields.H"
 #   include "readGravitationalAcceleration.H"
 #   include "readCombustionProperties.H"
@@ -63,7 +67,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-#       include "readPISOControls.H"
 #       include "compressibleCourantNo.H"
 #       include "setDeltaT.H"
 
@@ -97,13 +100,13 @@ int main(int argc, char *argv[])
 #       include "rhoEqn.H"
 #       include "UEqn.H"
 
-        for (label ocorr=1; ocorr <= nOuterCorr; ocorr++)
+        while (pimple.loop())
         {
 #           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/combustion/dieselFoam/pEqn.H b/applications/solvers/combustion/dieselFoam/pEqn.H
index 1e411d1ac..492babfad 100644
--- a/applications/solvers/combustion/dieselFoam/pEqn.H
+++ b/applications/solvers/combustion/dieselFoam/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/combustion/fireFoam/UEqn.H b/applications/solvers/combustion/fireFoam/UEqn.H
index ba5d7869b..a7638401f 100644
--- a/applications/solvers/combustion/fireFoam/UEqn.H
+++ b/applications/solvers/combustion/fireFoam/UEqn.H
@@ -7,30 +7,14 @@ fvVectorMatrix UEqn
 
 UEqn.relax();
 
-if (oCorr == nOuterCorr - 1)
-{
-    solve
+solve
+(
+    UEqn
+  ==
+    fvc::reconstruct
     (
-        UEqn
-      ==
-        fvc::reconstruct
-        (
-            fvc::interpolate(rho)*(g & mesh.Sf())
-          - fvc::snGrad(p)*mesh.magSf()
-        ),
-        mesh.solutionDict().solver("UFinal")
-    );
-}
-else
-{
-    solve
-    (
-        UEqn
-      ==
-        fvc::reconstruct
-        (
-            fvc::interpolate(rho)*(g & mesh.Sf())
-          - fvc::snGrad(p)*mesh.magSf()
-        )
-    );
-}
+        fvc::interpolate(rho)*(g & mesh.Sf())
+      - fvc::snGrad(p)*mesh.magSf()
+    ),
+    mesh.solutionDict().solver((U.select(pimple.finalIter())))
+);
diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H
index 0cb8e704b..b2acec7ed 100644
--- a/applications/solvers/combustion/fireFoam/createFields.H
+++ b/applications/solvers/combustion/fireFoam/createFields.H
@@ -128,3 +128,5 @@ if (composition.contains("fu"))
 }
 
 fields.add(hs);
+
+mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C
index 83cedd60b..b33d77ad7 100644
--- a/applications/solvers/combustion/fireFoam/fireFoam.C
+++ b/applications/solvers/combustion/fireFoam/fireFoam.C
@@ -33,6 +33,7 @@ Description
 #include "hsCombustionThermo.H"
 #include "turbulenceModel.H"
 #include "combustionModel.H"
+#include "pimpleControl.H"
 
 #include "radiationModel.H"
 
@@ -43,6 +44,9 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
     #include "readGravitationalAcceleration.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
@@ -57,7 +61,6 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readPISOControls.H"
         #include "readTimeControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
@@ -68,7 +71,7 @@ int main(int argc, char *argv[])
         #include "rhoEqn.H"
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
+        while (pimple.loop())
         {
             #include "UEqn.H"
 
@@ -76,7 +79,7 @@ int main(int argc, char *argv[])
             #include "fuhsEqn.H"
 
             // --- PISO loop
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
                 #include "pEqn.H"
             }
diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H
index 6c738b47c..f749f322c 100644
--- a/applications/solvers/combustion/fireFoam/pEqn.H
+++ b/applications/solvers/combustion/fireFoam/pEqn.H
@@ -17,7 +17,7 @@ surfaceScalarField phiU
 
 phi = phiU + rhorUAf*fvc::interpolate(rho)*(g & mesh.Sf());
 
-for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+while (pimple.correctNonOrthogonal())
 {
        surfaceScalarField rhorUAf = fvc::interpolate(rho*rUA);
 
@@ -30,16 +30,12 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
 
         closedVolume = p.needReference();
 
-        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())
         {
             phi += pEqn.flux();
         }
diff --git a/applications/solvers/combustion/reactingFoam/UEqn.H b/applications/solvers/combustion/reactingFoam/UEqn.H
index 9697c6e1e..1e626d75b 100644
--- a/applications/solvers/combustion/reactingFoam/UEqn.H
+++ b/applications/solvers/combustion/reactingFoam/UEqn.H
@@ -9,7 +9,7 @@
 
     UEqn.relax();
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
     }
diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H
index bd8f7ea1f..91b7fec2d 100644
--- a/applications/solvers/combustion/reactingFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/createFields.H
@@ -96,3 +96,5 @@ DimensionedField<scalar, volMesh> chemistrySh
     mesh,
     dimensionedScalar("chemistrySh", dimEnergy/dimTime/dimVolume, 0.0)
 );
+
+mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/combustion/reactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/pEqn.H
index 9443f909a..2881cfbf8 100644
--- a/applications/solvers/combustion/reactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/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
         (
@@ -26,7 +26,7 @@ if (transonic)
 
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi == pEqn.flux();
         }
@@ -41,7 +41,7 @@ else
           + fvc::ddtPhiCorr(rUA, rho, U, phi)
         );
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -52,7 +52,7 @@ else
 
         pEqn.solve();
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi += pEqn.flux();
         }
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 0b7bd2f8c..4afe1dd4b 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -35,6 +35,7 @@ Description
 #include "psiChemistryModel.H"
 #include "chemistrySolver.H"
 #include "multivariateScheme.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,6 +44,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"
@@ -58,7 +62,6 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
 #       include "readTimeControls.H"
-#       include "readPISOControls.H"
 #       include "compressibleCourantNo.H"
 #       include "setDeltaT.H"
 
@@ -68,14 +71,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/tutorials/combustion/dieselFoam/aachenBomb/0/ft b/tutorials/combustion/dieselFoam/aachenBomb/0/ft
index 6349d840e..e2cad4826 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/ft
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/ft
@@ -20,7 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    fixedWalls
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/fu b/tutorials/combustion/dieselFoam/aachenBomb/0/fu
index bbfd5255e..180da8ef0 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/fu
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/fu
@@ -20,7 +20,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    fixedWalls
+    walls
     {
         type            zeroGradient;
     }
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes
index 7c9666d84..c16208c7d 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes
+++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes
@@ -42,7 +42,7 @@ divSchemes
         ft vanLeer;
         hs vanLeer;
     };
-    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div((muEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -68,10 +68,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
index 47cb55006..5014c79d1 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
+++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
@@ -41,7 +41,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     transonic       no;
     nCorrectors     2;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G
index 886576aad..da4a4729c 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G
@@ -20,13 +20,38 @@ internalField   uniform 0;
 
 boundaryField
 {
-    ".*"
+    outlet
     {
         type            MarshakRadiation;
         T               T;
         emissivity      1;
         value           uniform 0;
     }
+    sides
+    {
+        type            MarshakRadiation;
+        T               T;
+        emissivity      1;
+        value           uniform 0;
+    }
+    base
+    {
+        type            MarshakRadiation;
+        T               T;
+        emissivity      1;
+        value           uniform 0;
+    }
+    inlet
+    {
+        type            MarshakRadiation;
+        T               T;
+        emissivity      1;
+        value           uniform 0;
+    }
+    frontAndBack
+    {
+        type        empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault
index cfafdbfeb..169dfbbb3 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault
@@ -20,13 +20,38 @@ internalField   uniform 0;
 
 boundaryField
 {
-    ".*"
+    outlet
     {
         type            greyDiffusiveRadiation;
         T               T;
         emissivity      1.0
         value           uniform 0;
     }
+    sides
+    {
+        type            greyDiffusiveRadiation;
+        T               T;
+        emissivity      1.0
+        value           uniform 0;
+    }
+    base
+    {
+        type            greyDiffusiveRadiation;
+        T               T;
+        emissivity      1.0
+        value           uniform 0;
+    }
+    inlet
+    {
+        type            greyDiffusiveRadiation;
+        T               T;
+        emissivity      1.0
+        value           uniform 0;
+    }
+    frontAndBack
+    {
+        type        empty;
+    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T
index 1075906ef..69aa27375 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T
@@ -42,7 +42,7 @@ boundaryField
         type            fixedValue;
         value           uniform 300;
     }
-    frontBack
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
index 53d8d545f..d20ddd180 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
@@ -45,7 +45,7 @@ boundaryField
         type            fixedValue;
         value           uniform (0 0.05 0);
     }
-    frontBack
+    frontAndBack
     {
         type        empty;
     }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphaSgs b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphaSgs
index b0a32604b..46295b928 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphaSgs
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphaSgs
@@ -37,7 +37,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    frontBack
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/b b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/b
index fcbd131bf..057d2049a 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/b
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/b
@@ -37,7 +37,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    frontBack
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ft b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ft
index 182b188f3..b1a2e70eb 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ft
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ft
@@ -42,7 +42,7 @@ boundaryField
         type            fixedValue;
         value           uniform 1.0;
     }
-    frontBack
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/fu b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/fu
index 5c869be9b..b5b562119 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/fu
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/fu
@@ -42,7 +42,7 @@ boundaryField
         type            fixedValue;
         value           uniform 1.0;
     }
-    frontBack
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k
index 6e63fdaee..6dc6c57b6 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k
@@ -43,7 +43,7 @@ boundaryField
         type            fixedValue;
         value           uniform 1e-4;
     }
-    frontBack
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/muSgs b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/muSgs
index 6071868b5..eb77f490b 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/muSgs
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/muSgs
@@ -37,7 +37,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    frontBack
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p
index 3d1434982..f6e972ed1 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p
@@ -45,7 +45,7 @@ boundaryField
         type            buoyantPressure;
         value           $internalField;
     }
-    frontBack
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
index 9bfdda5eb..7511c6de3 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
         ft              limitedLinear01 1;
         hs              limitedLinear 1;
     };
-    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div((muEff*dev2(T(grad(U))))) Gauss linear;
     div(phiU,p)     Gauss linear;
     div(Ji,Ii_h)    Gauss upwind;
 }
@@ -66,10 +66,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
index 2606a1208..ad0890514 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
@@ -124,7 +124,7 @@ solvers
 
 }
 
-PISO
+PIMPLE
 {
     momentumPredictor yes;
     nOuterCorrectors  1;
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/Allrun b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/Allrun
old mode 100644
new mode 100755
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
index 2b27eeb69..ec2c58a30 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
     div(phid,p)     Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;
     div(phi,k) Gauss limitedLinear 1;
-    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div((muEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -61,10 +61,4 @@ snGradSchemes
     default         uncorrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution
index 823182633..d4e19e70b 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution
@@ -41,7 +41,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;

From bb0cb435e589fadf28d5c459556b2961c5a59eed Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sun, 8 May 2016 14:55:17 +0200
Subject: [PATCH 54/55] Cleaned dbnsFoam, dbnsTurbFoam, rhoCentralFoam
 tutorials (backports)

---
 .../scalarTransportFoam/swirlTest/system/fvSchemes    |  5 -----
 .../dbnsFoam/forwardStep/system/fvSchemes             |  3 ---
 .../compressible/dbnsFoam/shockTube/system/fvSchemes  |  3 ---
 .../dbnsTurbFoam/naca0012/system/fvSchemes            |  7 -------
 .../LadenburgJet60psi/constant/polyMesh/boundary      |  4 ++--
 .../forwardStep/constant/polyMesh/boundary            |  9 ++-------
 .../obliqueShock/constant/polyMesh/boundary           | 11 +++--------
 .../shockTube/constant/polyMesh/boundary              |  6 ++----
 .../wedge15Ma5/constant/polyMesh/boundary             |  4 ++--
 9 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/tutorials/basic/scalarTransportFoam/swirlTest/system/fvSchemes b/tutorials/basic/scalarTransportFoam/swirlTest/system/fvSchemes
index 06eafe8f2..c9ac89abf 100644
--- a/tutorials/basic/scalarTransportFoam/swirlTest/system/fvSchemes
+++ b/tutorials/basic/scalarTransportFoam/swirlTest/system/fvSchemes
@@ -47,9 +47,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/dbnsFoam/forwardStep/system/fvSchemes b/tutorials/compressible/dbnsFoam/forwardStep/system/fvSchemes
index 5d4d11444..ee3148a33 100644
--- a/tutorials/compressible/dbnsFoam/forwardStep/system/fvSchemes
+++ b/tutorials/compressible/dbnsFoam/forwardStep/system/fvSchemes
@@ -39,7 +39,4 @@ interpolationSchemes
 snGradSchemes
 {}
 
-fluxRequired
-{}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/dbnsFoam/shockTube/system/fvSchemes b/tutorials/compressible/dbnsFoam/shockTube/system/fvSchemes
index 5d4d11444..ee3148a33 100644
--- a/tutorials/compressible/dbnsFoam/shockTube/system/fvSchemes
+++ b/tutorials/compressible/dbnsFoam/shockTube/system/fvSchemes
@@ -39,7 +39,4 @@ interpolationSchemes
 snGradSchemes
 {}
 
-fluxRequired
-{}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/dbnsTurbFoam/naca0012/system/fvSchemes b/tutorials/compressible/dbnsTurbFoam/naca0012/system/fvSchemes
index ff69efaf9..503318bf8 100644
--- a/tutorials/compressible/dbnsTurbFoam/naca0012/system/fvSchemes
+++ b/tutorials/compressible/dbnsTurbFoam/naca0012/system/fvSchemes
@@ -32,8 +32,6 @@ divSchemes
     div(phi,epsilon) Gauss upwind;
     div(devRhoReff) Gauss linear;
     div((devRhoReff&U)) Gauss linear;
-
-    div((muEff*dev2(grad(U).T()))) Gauss linear;
 }
 
 laplacianSchemes
@@ -56,11 +54,6 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-}
-
 relaxationFactors
 {
     k               0.7;
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary
index 816a48a66..1b48beb07 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/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/rhoCentralFoam/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary
index 9655c2db9..374eca527 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/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
 {
@@ -20,35 +20,30 @@ FoamFile
     inlet
     {
         type            patch;
-        physicalType    supersonicInlet;
         nFaces          80;
         startFace       31936;
     }
     outlet
     {
         type            patch;
-        physicalType    pressureTransmissiveOutlet;
         nFaces          64;
         startFace       32016;
     }
     bottom
     {
         type            symmetryPlane;
-        physicalType    symmetryPlane;
         nFaces          48;
         startFace       32080;
     }
     top
     {
         type            symmetryPlane;
-        physicalType    symmetryPlane;
         nFaces          240;
         startFace       32128;
     }
     obstacle
     {
         type            patch;
-        physicalType    adiabaticWall;
         nFaces          208;
         startFace       32368;
     }
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary
index b1533b4f4..1403b3108 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/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
 {
@@ -19,36 +19,31 @@ FoamFile
 (
     top
     {
-        type            patch;
-        physicalType    inlet;
+        type            wall;
         nFaces          60;
         startFace       3510;
     }
     inlet
     {
         type            patch;
-        physicalType    supersonicInlet;
         nFaces          30;
         startFace       3570;
     }
     outlet
     {
         type            patch;
-        physicalType    extrapolatedOutlet;
         nFaces          30;
         startFace       3600;
     }
     bottom
     {
         type            symmetryPlane;
-        physicalType    symmetryPlane;
         nFaces          60;
         startFace       3630;
     }
     frontAndBack
     {
         type            empty;
-        physicalType    empty;
         nFaces          3600;
         startFace       3690;
     }
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary
index ccbad270a..53a52f02b 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoCentralFoam/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
 {
@@ -20,14 +20,12 @@ FoamFile
     sides
     {
         type            patch;
-        physicalType    outletAdiabatic;
         nFaces          2;
         startFace       99;
     }
     empty
     {
         type            empty;
-        physicalType    empty;
         nFaces          400;
         startFace       101;
     }
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary
index b7d6204fe..bec7824fb 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoCentralFoam/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
 {

From 04d8d1b849f6afdd24098b621e273132b0c4ce87 Mon Sep 17 00:00:00 2001
From: Vanja Skuric <vanja.skuric@fsb.hr>
Date: Sun, 8 May 2016 15:36:11 +0200
Subject: [PATCH 55/55] Backported rhoPimpleFoam, rhoPisoFoam and tutorials
 (vanilla OF 3.0.1)

---
 .../solvers/compressible/rhoPimpleFoam/UEqn.H | 34 +++++----------
 .../compressible/rhoPimpleFoam/createFields.H |  2 +
 .../solvers/compressible/rhoPimpleFoam/hEqn.H | 15 +++----
 .../solvers/compressible/rhoPimpleFoam/pEqn.H | 42 ++++++-------------
 .../rhoPimpleFoam/rhoPimpleFoam.C             | 11 +++--
 .../solvers/compressible/rhoPisoFoam/UEqn.H   |  2 +-
 .../compressible/rhoPisoFoam/createFields.H   |  2 +
 .../solvers/compressible/rhoPisoFoam/pEqn.H   | 10 ++---
 .../compressible/rhoPisoFoam/rhoPisoFoam.C    |  7 +++-
 .../rhoPimpleFoam/angledDuct/system/fvSchemes |  8 +---
 .../angledDuct/system/fvSolution              |  2 +
 .../rhoPisoFoam/les/pitzDaily/Allrun          |  0
 .../les/pitzDaily/constant/polyMesh/boundary  |  4 +-
 .../les/pitzDaily/system/fvSchemes            |  8 +---
 .../rhoPisoFoam/ras/cavity/system/fvSchemes   |  8 +---
 15 files changed, 56 insertions(+), 99 deletions(-)
 mode change 100644 => 100755 tutorials/compressible/rhoPisoFoam/les/pitzDaily/Allrun

diff --git a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
index 3925650ec..734329af4 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
@@ -7,34 +7,20 @@ tmp<fvVectorMatrix> UEqn
   + 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().relaxationFactor(U.select(pimple.finalIter()))
+);
 
 volScalarField rUA = 1.0/UEqn().A();
 
-if (momentumPredictor)
+if (pimple.momentumPredictor())
 {
-    if (oCorr == nOuterCorr-1)
-    {
-        solve(UEqn() == -fvc::grad(p), mesh.solutionDict().solver("UFinal"));
-    }
-    else
-    {
-        solve(UEqn() == -fvc::grad(p));
-    }
+    solve
+    (
+        UEqn() == -fvc::grad(p),
+        mesh.solutionDict().solver((U.select(pimple.finalIter())))
+    );
 }
 else
 {
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index 1433ea5cc..20e25e948 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@@ -62,3 +62,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/applications/solvers/compressible/rhoPimpleFoam/hEqn.H b/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
index 521253647..60e38e90d 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
@@ -8,16 +8,11 @@
         DpDt
     );
 
-    if (oCorr == nOuterCorr-1)
-    {
-        hEqn.relax();
-        hEqn.solve(mesh.solutionDict().solver("hFinal"));
-    }
-    else
-    {
-        hEqn.relax();
-        hEqn.solve();
-    }
+    hEqn.relax
+    (
+        mesh.solutionDict().relaxationFactor(h.select(pimple.finalIter()))
+    );
+    hEqn.solve(mesh.solutionDict().solver((h.select(pimple.finalIter()))));
 
     thermo.correct();
 }
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index 5c2154510..1de123402 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -3,12 +3,12 @@ rho = thermo.rho();
 volScalarField rUA = 1.0/UEqn().A();
 U = rUA*UEqn().H();
 
-if (nCorr <= 1)
+if (pimple.nCorrPISO() <= 1)
 {
     UEqn.clear();
 }
 
-if (transonic)
+if (pimple.transonic())
 {
     surfaceScalarField phid
     (
@@ -20,7 +20,7 @@ if (transonic)
         )
     );
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
@@ -29,21 +29,12 @@ if (transonic)
           - fvm::laplacian(rho*rUA, p)
         );
 
-        if
+        pEqn.solve
         (
-            oCorr == nOuterCorr-1
-            && corr == nCorr-1
-            && nonOrth == nNonOrthCorr
-        )
-        {
-            pEqn.solve(mesh.solutionDict().solver("pFinal"));
-        }
-        else
-        {
-            pEqn.solve();
-        }
+            mesh.solutionDict().solver(p.select(pimple.finalInnerIter()))
+        );
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi == pEqn.flux();
         }
@@ -58,7 +49,7 @@ else
         //+ fvc::ddtPhiCorr(rUA, rho, U, phi)
         );
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         // Pressure corrector
         fvScalarMatrix pEqn
@@ -68,21 +59,12 @@ else
           - fvm::laplacian(rho*rUA, p)
         );
 
-        if
+        pEqn.solve
         (
-            oCorr == nOuterCorr-1
-         && corr == nCorr-1
-         && nonOrth == nNonOrthCorr
-        )
-        {
-            pEqn.solve(mesh.solutionDict().solver("pFinal"));
-        }
-        else
-        {
-            pEqn.solve();
-        }
+            mesh.solutionDict().solver(p.select(pimple.finalInnerIter()))
+        );
 
-        if (nonOrth == nNonOrthCorr)
+        if (pimple.finalNonOrthogonalIter())
         {
             phi += pEqn.flux();
         }
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index a5e65d9ed..836ce67aa 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -37,6 +37,7 @@ Description
 #include "basicPsiThermo.H"
 #include "turbulenceModel.H"
 #include "bound.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 "createFields.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"
@@ -56,7 +60,6 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
         #include "readTimeControls.H"
-        #include "readPIMPLEControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
 
@@ -64,7 +67,7 @@ int main(int argc, char *argv[])
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        if (nOuterCorr != 1)
+        if (!pimple.firstIter())
         {
             p.storePrevIter();
             rho.storePrevIter();
@@ -73,13 +76,13 @@ int main(int argc, char *argv[])
         #include "rhoEqn.H"
 
         // --- Pressure-velocity PIMPLE corrector loop
-        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
+        while (pimple.loop())
         {
             #include "UEqn.H"
             #include "hEqn.H"
 
             // --- PISO loop
-            for (int corr = 0; corr < nCorr; corr++)
+            while (pimple.correct())
             {
                 #include "pEqn.H"
             }
diff --git a/applications/solvers/compressible/rhoPisoFoam/UEqn.H b/applications/solvers/compressible/rhoPisoFoam/UEqn.H
index 64dd52b1b..3016e1b9a 100644
--- a/applications/solvers/compressible/rhoPisoFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoPisoFoam/UEqn.H
@@ -5,7 +5,7 @@
       + turbulence->divDevRhoReff(U)
     );
 
-    if (momentumPredictor)
+    if (piso.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
     }
diff --git a/applications/solvers/compressible/rhoPisoFoam/createFields.H b/applications/solvers/compressible/rhoPisoFoam/createFields.H
index fdb706a14..b823a5499 100644
--- a/applications/solvers/compressible/rhoPisoFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPisoFoam/createFields.H
@@ -56,3 +56,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/applications/solvers/compressible/rhoPisoFoam/pEqn.H b/applications/solvers/compressible/rhoPisoFoam/pEqn.H
index 280842ecc..f573238c3 100644
--- a/applications/solvers/compressible/rhoPisoFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPisoFoam/pEqn.H
@@ -3,7 +3,7 @@ rho = thermo.rho();
 volScalarField rUA = 1.0/UEqn.A();
 U = rUA*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/compressible/rhoPisoFoam/rhoPisoFoam.C b/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
index 279173b5c..6311dda73 100644
--- a/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
+++ b/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
@@ -32,6 +32,7 @@ Description
 #include "fvCFD.H"
 #include "basicPsiThermo.H"
 #include "turbulenceModel.H"
+#include "pisoControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -41,6 +42,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 "readTimeControls.H"
-        #include "readPISOControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
 
@@ -67,7 +70,7 @@ int main(int argc, char *argv[])
         #include "UEqn.H"
 
         // --- PISO loop
-        for (int corr = 1; corr <= nCorr; corr++)
+        while (piso.correct())
         {
             #include "hEqn.H"
             #include "pEqn.H"
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes
index 18898c1e2..d250fae19 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes
@@ -40,7 +40,7 @@ divSchemes
     div((rho*R))    Gauss linear;
     div(R)          Gauss linear;
     div(U)          Gauss linear;
-    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/rhoPimpleFoam/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution
index d18d99e8a..268b37c23 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution
@@ -118,9 +118,11 @@ PIMPLE
 relaxationFactors
 {
     U               0.7;
+    UFinal          1.0;
     p               0.3;
     rho             0.05;
     h               0.7;
+    hFinal          1.0;
     k               0.7;
     omega           0.7;
 }
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/Allrun b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/Allrun
old mode 100644
new mode 100755
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary
index 061b795fa..3a93a6794 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/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/rhoPisoFoam/les/pitzDaily/system/fvSchemes b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSchemes
index 54d1d63b0..544078e76 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSchemes
@@ -37,7 +37,7 @@ divSchemes
     div(phi,B)      Gauss limitedLinear 1;
     div(phi,muTilda) Gauss limitedLinear 1;
     div(B)          Gauss linear;
-    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div((muEff*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
@@ -62,10 +62,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSchemes b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSchemes
index 0e47bc900..36c1a275f 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSchemes
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSchemes
@@ -40,7 +40,7 @@ divSchemes
     div((rho*R))    Gauss linear;
     div(R)          Gauss linear;
     div(U)          Gauss linear;
-    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               ;
-}
-
 // ************************************************************************* //